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

sync/notifier/invalidation_notifier.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 "sync/notifier/invalidation_notifier.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ skipping 34 matching lines @@
   DCHECK(CalledOnValidThread());
   registrar_.UpdateRegisteredIds(handler, ids);
   invalidation_listener_.UpdateRegisteredIds(registrar_.GetAllRegisteredIds());
 }
 
 void InvalidationNotifier::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   registrar_.UnregisterHandler(handler);
 }
 
+InvalidatorState InvalidationNotifier::GetInvalidatorState() const {
+  DCHECK(CalledOnValidThread());
+  return registrar_.GetInvalidatorState();
+}
+
 void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
   DCHECK(CalledOnValidThread());
   client_id_ = unique_id;
   DVLOG(1) << "Setting unique ID to " << unique_id;
   CHECK(!client_id_.empty());
 }
 
 void InvalidationNotifier::SetStateDeprecated(const std::string& state) {
   DCHECK(CalledOnValidThread());
   DCHECK_LT(state_, STARTED);
@@ skipping 22 matching lines @@
         client_id_, client_info_, invalidation_state_,
         initial_max_invalidation_versions_,
         invalidation_state_tracker_,
         this);
     invalidation_state_.clear();
     state_ = STARTED;
   }
   invalidation_listener_.UpdateCredentials(email, token);
 }
 
-void InvalidationNotifier::SendNotification(
+void InvalidationNotifier::SendInvalidation(
     const ObjectIdStateMap& id_state_map) {
   DCHECK(CalledOnValidThread());
   // Do nothing.
 }
 
 void InvalidationNotifier::OnInvalidate(const ObjectIdStateMap& id_state_map) {
   DCHECK(CalledOnValidThread());
-  registrar_.DispatchInvalidationsToHandlers(id_state_map, REMOTE_NOTIFICATION);
+  registrar_.DispatchInvalidationsToHandlers(id_state_map, REMOTE_INVALIDATION);
 }
 
-void InvalidationNotifier::OnNotificationsEnabled() {
+void InvalidationNotifier::OnInvalidatorStateChange(InvalidatorState state) {
   DCHECK(CalledOnValidThread());
-  registrar_.EmitOnNotificationsEnabled();
-}
-
-void InvalidationNotifier::OnNotificationsDisabled(
-    NotificationsDisabledReason reason) {
-  DCHECK(CalledOnValidThread());
-  registrar_.EmitOnNotificationsDisabled(reason);
+  registrar_.UpdateInvalidatorState(state);
 }
 
 }  // namespace syncer