[Invalidations] Add GetInvalidatorState() to Invalidator{,Frontend}

chrome/browser/chrome_to_mobile_service.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 166 matching lines @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       profile_(profile),
       sync_invalidation_enabled_(false) {
   // TODO(msw): Unit tests do not provide profiles; see http://crbug.com/122183
   ProfileSyncService* profile_sync_service =
       profile_ ? ProfileSyncServiceFactory::GetForProfile(profile_) : NULL;
   if (profile_sync_service) {
     CloudPrintURL cloud_print_url(profile_);
     cloud_print_url_ = cloud_print_url.GetCloudPrintServiceURL();
     // Register for cloud print device list invalidation notifications.
-    // TODO(msw|akalin): Initialize |sync_invalidation_enabled_| properly.
+    sync_invalidation_enabled_ =

[msw, 2012/09/06 00:43:48]

nit: move above the "Register for cloud..." comment.

[akalin, 2012/09/06 20:30:11]

Done.

+        (profile_sync_service->GetInvalidatorState() ==
+         syncer::INVALIDATIONS_ENABLED);
     profile_sync_service->RegisterInvalidationHandler(this);
     syncer::ObjectIdSet ids;
     ids.insert(invalidation::ObjectId(
         ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
         kSyncInvalidationObjectIdChromeToMobileDeviceList));
     profile_sync_service->UpdateRegisteredInvalidationIds(this, ids);
   }
 }
 
 ChromeToMobileService::~ChromeToMobileService() {
@@ skipping 149 matching lines @@
 void ChromeToMobileService::OnGetTokenFailure(
     const GoogleServiceAuthError& error) {
   access_token_fetcher_.reset();
   auth_retry_timer_.Stop();
 
   auth_retry_timer_.Start(
       FROM_HERE, base::TimeDelta::FromHours(kAuthRetryDelayHours),
       this, &ChromeToMobileService::RequestAccessToken);
 }
 
-void ChromeToMobileService::OnNotificationsEnabled() {
-  sync_invalidation_enabled_ = true;
+void ChromeToMobileService::OnInvalidatorStateChange(
+    syncer::InvalidatorState state) {
+  sync_invalidation_enabled_ = (state == syncer::INVALIDATIONS_ENABLED);
   UpdateCommandState();
 }
 
-void ChromeToMobileService::OnNotificationsDisabled(
-    syncer::NotificationsDisabledReason reason) {
-  sync_invalidation_enabled_ = false;
-  UpdateCommandState();
-}
-
-void ChromeToMobileService::OnIncomingNotification(
+void ChromeToMobileService::OnIncomingInvalidation(
     const syncer::ObjectIdStateMap& id_state_map,
-    syncer::IncomingNotificationSource source) {
+    syncer::IncomingInvalidationSource source) {
   DCHECK_EQ(1U, id_state_map.size());
   DCHECK_EQ(1U, id_state_map.count(invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_COMPONENTS,
       kSyncInvalidationObjectIdChromeToMobileDeviceList)));
   RequestDeviceSearch();
-  // TODO(msw|akalin): This may not necessarily mean notifications are enabled.
-  OnNotificationsEnabled();
 }
 
 const std::string& ChromeToMobileService::GetAccessTokenForTest() const {
   return access_token_;
 }
 
 void ChromeToMobileService::SetAccessTokenForTest(
     const std::string& access_token) {
   access_token_ = access_token;
 }
@@ skipping 204 matching lines @@
 
       // Report failure below and ignore the second response.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   if (observer.get())
     observer->OnSendComplete(success);
 }