Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/gcm_network_channel_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "components/invalidation/gcm_network_channel.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 232 matching lines @@
 }
 
 TEST_F(GCMNetworkChannelTest, HappyCase) {
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
   EXPECT_FALSE(delegate()->message_callback.is_null());
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          std::string(),
                                          net::HTTP_NO_CONTENT,
                                          net::URLRequestStatus::SUCCESS);
 
+  // Emulate gcm connection state to be online.
+  delegate()->connection_state_callback.Run(true);
   // After construction GCMNetworkChannel should have called Register.
   EXPECT_FALSE(delegate()->register_callback.is_null());
   // Return valid registration id.
   delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   // SendMessage should have triggered RequestToken. No HTTP request should be
   // started yet.
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   EXPECT_EQ(url_fetchers_created_count(), 0);
@@ skipping 140 matching lines @@
     EXPECT_EQ(input, plain);
   }
   // Presence of '-', '_'.
   input = "\xfb\xff";
   Base64EncodeURLSafe(input, &base64);
   EXPECT_EQ("-_8", base64);
   EXPECT_TRUE(Base64DecodeURLSafe(base64, &plain));
   EXPECT_EQ(input, plain);
 }
 
-TEST_F(GCMNetworkChannelTest, HttpTransientError) {
+TEST_F(GCMNetworkChannelTest, ChannelState) {
   EXPECT_FALSE(delegate()->message_callback.is_null());
   // POST will fail.
   url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
                                          std::string(),
                                          net::HTTP_SERVICE_UNAVAILABLE,
                                          net::URLRequestStatus::SUCCESS);
 
+  delegate()->connection_state_callback.Run(true);
   delegate()->register_callback.Run("registration.id", gcm::GCMClient::SUCCESS);
 
   network_channel()->SendMessage("abra.cadabra");
   EXPECT_FALSE(delegate()->request_token_callback.is_null());
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 1);
   // Failing HTTP POST should cause TRANSIENT_INVALIDATION_ERROR.
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
-  // Network change to CONNECTION_NONE shouldn't affect invalidator state.
-  network_channel()->OnNetworkChanged(
-      net::NetworkChangeNotifier::CONNECTION_NONE);
-  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
-  // Network change to something else should trigger retry.
-  network_channel()->OnNetworkChanged(
-      net::NetworkChangeNotifier::CONNECTION_WIFI);
+
+  // Setup POST to succeed.
+  url_fetcher_factory()->SetFakeResponse(GURL("http://test.url.com"),
+                                         "",
+                                         net::HTTP_NO_CONTENT,
+                                         net::URLRequestStatus::SUCCESS);
+  network_channel()->SendMessage("abra.cadabra");
+  EXPECT_FALSE(delegate()->request_token_callback.is_null());
+  delegate()->request_token_callback.Run(
+      GoogleServiceAuthError::AuthErrorNone(), "access.token");
+  RunLoopUntilIdle();
+  EXPECT_EQ(url_fetchers_created_count(), 2);
+  // Successful post should set invalidator state to enabled.
   EXPECT_EQ(INVALIDATIONS_ENABLED, get_last_invalidator_state());
+  // Network changed event shouldn't affect invalidator state.
   network_channel()->OnNetworkChanged(
       net::NetworkChangeNotifier::CONNECTION_NONE);
   EXPECT_EQ(INVALIDATIONS_ENABLED, get_last_invalidator_state());
-}
 
-TEST_F(GCMNetworkChannelTest, GcmConnectionState) {
-  delegate()->connection_state_callback.Run(
-      GCMNetworkChannelDelegate::CONNECTION_STATE_OFFLINE);
+  // GCM connection state should affect invalidator state.
+  delegate()->connection_state_callback.Run(false);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, get_last_invalidator_state());
-  delegate()->connection_state_callback.Run(
-      GCMNetworkChannelDelegate::CONNECTION_STATE_ONLINE);
+  delegate()->connection_state_callback.Run(true);
   EXPECT_EQ(INVALIDATIONS_ENABLED, get_last_invalidator_state());
 }
 
 #if !defined(OS_ANDROID)
 TEST_F(GCMNetworkChannelTest, BuildUrl) {
   GURL url = BuildUrl("registration.id");
   EXPECT_TRUE(url.SchemeIsHTTPOrHTTPS());
   EXPECT_FALSE(url.host().empty());
   EXPECT_FALSE(url.path().empty());
   std::vector<std::string> parts;
@@ skipping 38 matching lines @@
   delegate()->request_token_callback.Run(
       GoogleServiceAuthError::AuthErrorNone(), "access.token");
   RunLoopUntilIdle();
   EXPECT_EQ(url_fetchers_created_count(), 3);
   // Echo_token should be from second message.
   EXPECT_EQ("echo.token", get_last_echo_token());
 }
 #endif
 
 }  // namespace syncer