Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / google_apis / gcm / engine / connection_factory_impl_unittest.cc

diff --git a/src/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/src/google_apis/gcm/engine/connection_factory_impl_unittest.cc
index da9485f..51958ea 100644 (file)
--- a/src/google_apis/gcm/engine/connection_factory_impl_unittest.cc
+++ b/src/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -159,6 +159,7 @@ TestConnectionFactoryImpl::TestConnectionFactoryImpl(
                             net::BackoffEntry::Policy(),
                             NULL,
                             NULL,
+                            NULL,
                             &dummy_recorder_),
       connect_result_(net::ERR_UNEXPECTED),
       num_expected_attempts_(0),
@@ -526,7 +527,8 @@ TEST_F(ConnectionFactoryImplTest, SignalResetRestoresBackoff) {
 
 // When the network is disconnected, close the socket and suppress further
 // connection attempts until the network returns.
-TEST_F(ConnectionFactoryImplTest, SuppressConnectWhenNoNetwork) {
+// Disabled while crbug.com/396687 is being investigated.
+TEST_F(ConnectionFactoryImplTest, DISABLED_SuppressConnectWhenNoNetwork) {
   factory()->SetConnectResult(net::OK);
   factory()->Connect();
   EXPECT_TRUE(factory()->NextRetryAttempt().is_null());