| Index: webrtc/p2p/base/transportcontroller_unittest.cc
 | 
| diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
 | 
| index c78352591b09ca49ce4ed39582bd538a010a4093..59909de2ca0bcdb4f35d4c6f94f3cfa22033d5ca 100644
 | 
| --- a/webrtc/p2p/base/transportcontroller_unittest.cc
 | 
| +++ b/webrtc/p2p/base/transportcontroller_unittest.cc
 | 
| @@ -134,6 +134,14 @@ class TransportControllerTest : public testing::Test,
 | 
|      channel2->SetConnectionCount(1);
 | 
|    }
 | 
|  
 | 
| +  cricket::IceConfig CreateIceConfig(int receiving_timeout_ms,
 | 
| +                                     bool continuous_gathering) {
 | 
| +    cricket::IceConfig config;
 | 
| +    config.receiving_timeout_ms = receiving_timeout_ms;
 | 
| +    config.continuous_gathering = continuous_gathering;
 | 
| +    return config;
 | 
| +  }
 | 
| +
 | 
|   protected:
 | 
|    void OnConnectionState(IceConnectionState state) {
 | 
|      if (!signaling_thread_->IsCurrent()) {
 | 
| @@ -189,17 +197,19 @@ class TransportControllerTest : public testing::Test,
 | 
|    bool signaled_on_non_signaling_thread_ = false;
 | 
|  };
 | 
|  
 | 
| -TEST_F(TransportControllerTest, TestSetIceReceivingTimeout) {
 | 
| +TEST_F(TransportControllerTest, TestSetIceConfig) {
 | 
|    FakeTransportChannel* channel1 = CreateChannel("audio", 1);
 | 
|    ASSERT_NE(nullptr, channel1);
 | 
|  
 | 
| -  transport_controller_->SetIceConnectionReceivingTimeout(1000);
 | 
| +  transport_controller_->SetIceConfig(CreateIceConfig(1000, true));
 | 
|    EXPECT_EQ(1000, channel1->receiving_timeout());
 | 
| +  EXPECT_TRUE(channel1->continuous_gathering());
 | 
|  
 | 
|    // Test that value stored in controller is applied to new channels.
 | 
|    FakeTransportChannel* channel2 = CreateChannel("video", 1);
 | 
|    ASSERT_NE(nullptr, channel2);
 | 
|    EXPECT_EQ(1000, channel2->receiving_timeout());
 | 
| +  EXPECT_TRUE(channel2->continuous_gathering());
 | 
|  }
 | 
|  
 | 
|  TEST_F(TransportControllerTest, TestSetSslMaxProtocolVersion) {
 | 
| 
 |