Retry: Move some sync/notifier to components/invalidation

sync/internal_api/public/base/invalidator_state.h

Index: sync/internal_api/public/base/invalidator_state.h
diff --git a/sync/notifier/invalidator_state.h b/sync/internal_api/public/base/invalidator_state.h
similarity index 60%
rename from sync/notifier/invalidator_state.h
rename to sync/internal_api/public/base/invalidator_state.h
index a269661e1fdfbde89de9b877079d3b923f99d161..3a1c7ee3d308709ce73500dcdc9fdf2957c0dcf9 100644
--- a/sync/notifier/invalidator_state.h
+++ b/sync/internal_api/public/base/invalidator_state.h
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_NOTIFIER_INVALIDATOR_STATE_H_
-#define SYNC_NOTIFIER_INVALIDATOR_STATE_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_
+#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_
 
-#include "jingle/notifier/listener/push_client_observer.h"
 #include "sync/base/sync_export.h"
 
 namespace syncer {
@@ -26,13 +25,6 @@ enum InvalidatorState {
 
 SYNC_EXPORT const char* InvalidatorStateToString(InvalidatorState state);
 
-InvalidatorState FromNotifierReason(
-    notifier::NotificationsDisabledReason reason);
-
-// Should not be called when |state| == INVALIDATIONS_ENABLED.
-SYNC_EXPORT_PRIVATE notifier::NotificationsDisabledReason
-    ToNotifierReasonForTest(InvalidatorState state);
-
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_INVALIDATOR_STATE_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_