Removing "candidates" attribute from TransportDescription.

webrtc/p2p/base/transportcontroller_unittest.cc

Index: webrtc/p2p/base/transportcontroller_unittest.cc
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
index 6ff158e8fc4e8d86ed8e5e16075c0980f0a92762..96d0e987181f382beb9c2f3851c19e5131185e53 100644
--- a/webrtc/p2p/base/transportcontroller_unittest.cc
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc
@@ -111,9 +111,9 @@ class TransportControllerTest : public testing::Test,
     FakeTransportChannel* channel2 = CreateChannel("video", 1);
     ASSERT_NE(nullptr, channel2);
 
-    TransportDescription local_desc(
-        std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_FULL,
-        cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+    TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
+                                    kIcePwd1, cricket::ICEMODE_FULL,
+                                    cricket::CONNECTIONROLE_ACTPASS, nullptr);
     std::string err;
     transport_controller_->SetLocalTransportDescription(
         "audio", local_desc, cricket::CA_OFFER, &err);
@@ -322,9 +322,9 @@ TEST_F(TransportControllerTest, TestGetRemoteSSLCertificate) {
 TEST_F(TransportControllerTest, TestSetLocalTransportDescription) {
   FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
-  TransportDescription local_desc(
-      std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_FULL,
-      cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+  TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
+                                  kIcePwd1, cricket::ICEMODE_FULL,
+                                  cricket::CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, cricket::CA_OFFER, &err));
@@ -341,9 +341,9 @@ TEST_F(TransportControllerTest, TestSetLocalTransportDescription) {
 TEST_F(TransportControllerTest, TestSetRemoteTransportDescription) {
   FakeTransportChannel* channel = CreateChannel("audio", 1);
   ASSERT_NE(nullptr, channel);
-  TransportDescription remote_desc(
-      std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_FULL,
-      cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+  TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
+                                   kIcePwd1, cricket::ICEMODE_FULL,
+                                   cricket::CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, cricket::CA_OFFER, &err));
@@ -371,16 +371,16 @@ TEST_F(TransportControllerTest, TestReadyForRemoteCandidates) {
   EXPECT_FALSE(transport_controller_->ReadyForRemoteCandidates("audio"));
 
   std::string err;
-  TransportDescription remote_desc(
-      std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_FULL,
-      cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+  TransportDescription remote_desc(std::vector<std::string>(), kIceUfrag1,
+                                   kIcePwd1, cricket::ICEMODE_FULL,
+                                   cricket::CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetRemoteTransportDescription(
       "audio", remote_desc, cricket::CA_OFFER, &err));
   EXPECT_FALSE(transport_controller_->ReadyForRemoteCandidates("audio"));
 
-  TransportDescription local_desc(
-      std::vector<std::string>(), kIceUfrag2, kIcePwd2, cricket::ICEMODE_FULL,
-      cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+  TransportDescription local_desc(std::vector<std::string>(), kIceUfrag2,
+                                  kIcePwd2, cricket::ICEMODE_FULL,
+                                  cricket::CONNECTIONROLE_ACTPASS, nullptr);
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, cricket::CA_ANSWER, &err));
   EXPECT_TRUE(transport_controller_->ReadyForRemoteCandidates("audio"));
@@ -650,9 +650,9 @@ TEST_F(TransportControllerTest, TestSignalCandidatesGathered) {
   ASSERT_NE(nullptr, channel);
 
   // Transport won't signal candidates until it has a local description.
-  TransportDescription local_desc(
-      std::vector<std::string>(), kIceUfrag1, kIcePwd1, cricket::ICEMODE_FULL,
-      cricket::CONNECTIONROLE_ACTPASS, nullptr, Candidates());
+  TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1,
+                                  kIcePwd1, cricket::ICEMODE_FULL,
+                                  cricket::CONNECTIONROLE_ACTPASS, nullptr);
   std::string err;
   EXPECT_TRUE(transport_controller_->SetLocalTransportDescription(
       "audio", local_desc, cricket::CA_OFFER, &err));