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

sync/notifier/chrome_invalidation_client.cc

Index: sync/notifier/chrome_invalidation_client.cc
diff --git a/sync/notifier/chrome_invalidation_client.cc b/sync/notifier/chrome_invalidation_client.cc
index efa45e133dd0741da54875435a532779d3752ed0..849d9cf36be28131d6c3a5c8daa589e99db0d159 100644
--- a/sync/notifier/chrome_invalidation_client.cc
+++ b/sync/notifier/chrome_invalidation_client.cc
@@ -32,7 +32,6 @@ ChromeInvalidationClient::Listener::~Listener() {}
 ChromeInvalidationClient::ChromeInvalidationClient()
     : chrome_system_resources_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       listener_(NULL),
-      state_writer_(NULL),
       ticl_ready_(false) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
 }
@@ -41,7 +40,6 @@ ChromeInvalidationClient::~ChromeInvalidationClient() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   Stop();
   DCHECK(!listener_);
-  DCHECK(!state_writer_);
 }
 
 void ChromeInvalidationClient::Start(
@@ -51,7 +49,6 @@ void ChromeInvalidationClient::Start(
     const browser_sync::WeakHandle<InvalidationStateTracker>&
         invalidation_state_tracker,
     Listener* listener,
-    StateWriter* state_writer,
     base::WeakPtr<buzz::XmppTaskParentInterface> base_task) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   Stop();
@@ -82,9 +79,6 @@ void ChromeInvalidationClient::Start(
   DCHECK(!listener_);
   DCHECK(listener);
   listener_ = listener;
-  DCHECK(!state_writer_);
-  DCHECK(state_writer);
-  state_writer_ = state_writer;
 
   int client_type = ipc::invalidation::ClientType::CHROME_SYNC;
   invalidation_client_.reset(
@@ -121,7 +115,6 @@ void ChromeInvalidationClient::Stop() {
   invalidation_client_->Stop();
 
   invalidation_client_.reset();
-  state_writer_ = NULL;
   listener_ = NULL;
 
   invalidation_state_tracker_.Reset();
@@ -306,8 +299,9 @@ void ChromeInvalidationClient::InformError(
 
 void ChromeInvalidationClient::WriteState(const std::string& state) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
-  CHECK(state_writer_);
-  state_writer_->WriteState(state);
+  DVLOG(1) << "WriteState";
+  invalidation_state_tracker_.Call(
+      FROM_HERE, &InvalidationStateTracker::SetInvalidationState, state);
 }
 
 }  // namespace sync_notifier