Report InvalidatorState correctly from GCMNetworkChannel

components/invalidation/push_client_channel.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/push_client_channel.h"
 
 #include "base/stl_util.h"
 #include "components/invalidation/notifier_reason_util.h"
 #include "google/cacheinvalidation/client_gateway.pb.h"
 #include "google/cacheinvalidation/types.pb.h"
@@ skipping 52 matching lines @@
   recipient.to = kBotJid;
   notifier::Notification notification;
   notification.channel = kChannelName;
   notification.recipients.push_back(recipient);
   notification.data = encoded_message;
   push_client_->SendNotification(notification);
   sent_messages_count_++;
 }
 
 void PushClientChannel::OnNotificationsEnabled() {
-  NotifyStateChange(INVALIDATIONS_ENABLED);
+  NotifyNetworkStatusChange(true);
+  NotifyChannelStateChange(INVALIDATIONS_ENABLED);
 }
 
 void PushClientChannel::OnNotificationsDisabled(
     notifier::NotificationsDisabledReason reason) {
-  NotifyStateChange(FromNotifierReason(reason));
+  NotifyNetworkStatusChange(false);
+  NotifyChannelStateChange(FromNotifierReason(reason));
 }
 
 void PushClientChannel::OnIncomingNotification(
     const notifier::Notification& notification) {
   std::string message;
   std::string service_context;
   int64 scheduling_hash;
   if (!DecodeMessage(
            notification.data, &message, &service_context, &scheduling_hash)) {
     DLOG(ERROR) << "Could not parse ClientGatewayMessage";
@@ skipping 64 matching lines @@
 scoped_ptr<base::DictionaryValue> PushClientChannel::CollectDebugData() const {
   scoped_ptr<base::DictionaryValue> status(new base::DictionaryValue);
   status->SetString("PushClientChannel.NetworkChannel", "Push Client");
   status->SetInteger("PushClientChannel.SentMessages", sent_messages_count_);
   status->SetInteger("PushClientChannel.ReceivedMessages",
                      SyncNetworkChannel::GetReceivedMessagesCount());
   return status.Pass();
 }
 
 }  // namespace syncer