Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/sync_system_resources.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 <cstdlib>
 #include <cstring>
 #include <string>
 
@@ skipping 114 matching lines @@
 }
 
 void SyncInvalidationScheduler::RunPostedTask(invalidation::Closure* task) {
   CHECK_EQ(created_on_loop_, base::MessageLoop::current());
   task->Run();
   posted_tasks_.erase(task);
   delete task;
 }
 
 SyncNetworkChannel::SyncNetworkChannel()
-    : invalidator_state_(DEFAULT_INVALIDATION_ERROR),
+    : last_network_status_(false),
       received_messages_count_(0) {}
 
 SyncNetworkChannel::~SyncNetworkChannel() {
   STLDeleteElements(&network_status_receivers_);
 }
 
 void SyncNetworkChannel::SetMessageReceiver(
     invalidation::MessageCallback* incoming_receiver) {
   incoming_receiver_.reset(incoming_receiver);
 }
 
 void SyncNetworkChannel::AddNetworkStatusReceiver(
     invalidation::NetworkStatusCallback* network_status_receiver) {
-  network_status_receiver->Run(invalidator_state_ == INVALIDATIONS_ENABLED);
+  network_status_receiver->Run(last_network_status_);
   network_status_receivers_.push_back(network_status_receiver);
 }
 
 void SyncNetworkChannel::SetSystemResources(
     invalidation::SystemResources* resources) {
   // Do nothing.
 }
 
 void SyncNetworkChannel::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
@@ skipping 11 matching lines @@
       new PushClientChannel(push_client.Pass()));
 }
 
 scoped_ptr<SyncNetworkChannel> SyncNetworkChannel::CreateGCMNetworkChannel(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     scoped_ptr<GCMNetworkChannelDelegate> delegate) {
   return scoped_ptr<SyncNetworkChannel>(new GCMNetworkChannel(
       request_context_getter, delegate.Pass()));
 }
 
-void SyncNetworkChannel::NotifyStateChange(InvalidatorState invalidator_state) {
-  // Remember state for future NetworkStatusReceivers.
-  invalidator_state_ = invalidator_state;
+void SyncNetworkChannel::NotifyNetworkStatusChange(bool online) {
+  // Remember network state for future NetworkStatusReceivers.
+  last_network_status_ = online;
   // Notify NetworkStatusReceivers in cacheinvalidation.
   for (NetworkStatusReceiverList::const_iterator it =
            network_status_receivers_.begin();
        it != network_status_receivers_.end(); ++it) {
-    (*it)->Run(invalidator_state_ == INVALIDATIONS_ENABLED);
+    (*it)->Run(online);
   }
-  // Notify observers.
+}
+
+void SyncNetworkChannel::NotifyChannelStateChange(
+    InvalidatorState invalidator_state) {
   FOR_EACH_OBSERVER(Observer, observers_,
-                    OnNetworkChannelStateChanged(invalidator_state_));
+                    OnNetworkChannelStateChanged(invalidator_state));
 }
 
 bool SyncNetworkChannel::DeliverIncomingMessage(const std::string& message) {
   if (!incoming_receiver_) {
     DLOG(ERROR) << "No receiver for incoming notification";
     return false;
   }
   received_messages_count_++;
   incoming_receiver_->Run(message);
   return true;
@@ skipping 121 matching lines @@
 
 SyncInvalidationScheduler* SyncSystemResources::internal_scheduler() {
   return internal_scheduler_.get();
 }
 
 SyncInvalidationScheduler* SyncSystemResources::listener_scheduler() {
   return listener_scheduler_.get();
 }
 
 }  // namespace syncer