Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/sync_system_resources_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 "components/invalidation/sync_system_resources.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 163 matching lines @@
   message_loop_.RunUntilIdle();
   EXPECT_EQ(invalidation::Status(invalidation::Status::SUCCESS, std::string()),
             results);
 }
 
 class TestSyncNetworkChannel : public SyncNetworkChannel {
  public:
   TestSyncNetworkChannel() {}
   virtual ~TestSyncNetworkChannel() {}
 
-  using SyncNetworkChannel::NotifyStateChange;
+  using SyncNetworkChannel::NotifyNetworkStatusChange;
+  using SyncNetworkChannel::NotifyChannelStateChange;
   using SyncNetworkChannel::DeliverIncomingMessage;
 
   virtual void SendMessage(const std::string& message) OVERRIDE {
   }
 
   virtual void UpdateCredentials(const std::string& email,
       const std::string& token) OVERRIDE {
   }
 
   virtual int GetInvalidationClientType() OVERRIDE {
@@ skipping 31 matching lines @@
 
   void OnNetworkStatusChange(bool connected) {
     connected_ = connected;
   }
 
   TestSyncNetworkChannel network_channel_;
   InvalidatorState last_invalidator_state_;
   bool connected_;
 };
 
-// Simulate network channel state change. It should propagate to observer.
-TEST_F(SyncNetworkChannelTest, OnNetworkChannelStateChanged) {
+// Simulate channel state change. It should propagate to observer.
+TEST_F(SyncNetworkChannelTest, ChannelStateChange) {
   EXPECT_EQ(DEFAULT_INVALIDATION_ERROR, last_invalidator_state_);
+  network_channel_.NotifyChannelStateChange(INVALIDATIONS_ENABLED);
+  EXPECT_EQ(INVALIDATIONS_ENABLED, last_invalidator_state_);
+  network_channel_.NotifyChannelStateChange(INVALIDATION_CREDENTIALS_REJECTED);
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, last_invalidator_state_);
+}
+
+// Simulate network state change. It should propagate to cacheinvalidations.
+TEST_F(SyncNetworkChannelTest, NetworkStateChange) {
   EXPECT_FALSE(connected_);
-  network_channel_.NotifyStateChange(INVALIDATIONS_ENABLED);
-  EXPECT_EQ(INVALIDATIONS_ENABLED, last_invalidator_state_);
+  network_channel_.NotifyNetworkStatusChange(true);
   EXPECT_TRUE(connected_);
-  network_channel_.NotifyStateChange(INVALIDATION_CREDENTIALS_REJECTED);
-  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, last_invalidator_state_);
+  network_channel_.NotifyNetworkStatusChange(false);
   EXPECT_FALSE(connected_);
 }
 
 }  // namespace
 }  // namespace syncer