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

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 3f0b87d75b681c0a6cd6cfda9f2a856ab8eca827..a5534d1b8a2e1df8cd0ccbb3ca55c78eb084eb6a 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -467,6 +467,10 @@ void ProfileSyncService::UnregisterInvalidationHandler(
   invalidator_registrar_.UnregisterHandler(handler);
 }
 
+syncer::InvalidatorState ProfileSyncService::GetInvalidatorState() const {
+  return invalidator_registrar_.GetInvalidatorState();
+}
+
 void ProfileSyncService::Shutdown() {
   ShutdownImpl(false);
 }
@@ -659,18 +663,14 @@ void ProfileSyncService::DisableBrokenDatatype(
                  weak_factory_.GetWeakPtr()));
 }
 
-void ProfileSyncService::OnNotificationsEnabled() {
-  invalidator_registrar_.EmitOnNotificationsEnabled();
-}
-
-void ProfileSyncService::OnNotificationsDisabled(
-    syncer::NotificationsDisabledReason reason) {
-  invalidator_registrar_.EmitOnNotificationsDisabled(reason);
+void ProfileSyncService::OnInvalidatorStateChange(
+    syncer::InvalidatorState state) {
+  invalidator_registrar_.UpdateInvalidatorState(state);
 }
 
-void ProfileSyncService::OnIncomingNotification(
+void ProfileSyncService::OnIncomingInvalidation(
     const syncer::ObjectIdStateMap& id_state_map,
-    syncer::IncomingNotificationSource source) {
+    syncer::IncomingInvalidationSource source) {
   invalidator_registrar_.DispatchInvalidationsToHandlers(id_state_map, source);
 }