sync: migrate invalidation state from syncable::Directory to InvalidationStorage

sync/notifier/invalidation_notifier.h

Index: sync/notifier/invalidation_notifier.h
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index 1771ab77a8852d48dedbbe2191d1672ac0e7a216..aebf8339d1b364942c59d3b8b171ff183685ce55 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -22,7 +22,6 @@
 #include "base/threading/non_thread_safe.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/state_writer.h"
 #include "sync/notifier/sync_notifier.h"
 #include "sync/syncable/model_type.h"
 #include "sync/util/weak_handle.h"
@@ -36,13 +35,13 @@ namespace sync_notifier {
 // This class must live on the IO thread.
 class InvalidationNotifier
     : public SyncNotifier,
-      public ChromeInvalidationClient::Listener,
-      public StateWriter {
+      public ChromeInvalidationClient::Listener {
  public:
   // |invalidation_state_tracker| must be initialized.
   InvalidationNotifier(
       scoped_ptr<notifier::PushClient> push_client,
       const InvalidationVersionMap& initial_max_invalidation_versions,
+      const std::string& initial_invalidation_state,
       const browser_sync::WeakHandle<InvalidationStateTracker>&
           invalidation_state_tracker,
       const std::string& client_info);
@@ -53,7 +52,7 @@ class InvalidationNotifier
   virtual void AddObserver(SyncNotifierObserver* observer) OVERRIDE;
   virtual void RemoveObserver(SyncNotifierObserver* observer) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetState(const std::string& state) OVERRIDE;
+  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void UpdateEnabledTypes(
@@ -66,9 +65,6 @@ class InvalidationNotifier
       const syncable::ModelTypePayloadMap& type_payloads) OVERRIDE;
   virtual void OnSessionStatusChanged(bool has_session) OVERRIDE;
 
-  // StateWriter implementation.
-  virtual void WriteState(const std::string& state) OVERRIDE;
-
  private:
   base::NonThreadSafe non_thread_safe_;
 
@@ -100,6 +96,8 @@ class InvalidationNotifier
   std::string invalidation_client_id_;
 
   // The state to pass to |chrome_invalidation_client_|.
+  // TODO(tim): This should be made const once migration is completed for bug
+  // 124140.
   std::string invalidation_state_;
 
   // The invalidation client.