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

sync/notifier/chrome_invalidation_client_unittest.cc

Index: sync/notifier/chrome_invalidation_client_unittest.cc
diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index 2892491c230ec1ce652d76a337aa3f4b84584ec6..a6d4ab86caeb845673c1a7010324724bce432ffe 100644
--- a/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -10,7 +10,6 @@
 #include "google/cacheinvalidation/v2/types.pb.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "sync/notifier/chrome_invalidation_client.h"
-#include "sync/notifier/state_writer.h"
 #include "sync/syncable/model_type.h"
 #include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
@@ -28,6 +27,7 @@ namespace {
 const char kClientId[] = "client_id";
 const char kClientInfo[] = "client_info";
 const char kState[] = "state";
+const char kNewState[] = "new_state";
 
 class MockInvalidationClient : public invalidation::InvalidationClient {
  public:
@@ -56,11 +56,6 @@ class MockInvalidationStateTracker
   MOCK_METHOD1(SetInvalidationState, void(const std::string&));
 };
 
-class MockStateWriter : public StateWriter {
- public:
-  MOCK_METHOD1(WriteState, void(const std::string&));
-};
-
 }  // namespace
 
 class ChromeInvalidationClientTest : public testing::Test {
@@ -70,7 +65,7 @@ class ChromeInvalidationClientTest : public testing::Test {
                   InvalidationVersionMap(),
                   browser_sync::MakeWeakHandle(
                       mock_invalidation_state_tracker_.AsWeakPtr()),
-                  &mock_listener_, &mock_state_writer_,
+                  &mock_listener_,
                   fake_base_task_.AsWeakPtr());
   }
 
@@ -125,7 +120,6 @@ class ChromeInvalidationClientTest : public testing::Test {
   StrictMock<MockListener> mock_listener_;
   StrictMock<MockInvalidationStateTracker>
       mock_invalidation_state_tracker_;
-  StrictMock<MockStateWriter> mock_state_writer_;
   StrictMock<MockInvalidationClient> mock_invalidation_client_;
   notifier::FakeBaseTask fake_base_task_;
   ChromeInvalidationClient client_;
@@ -171,6 +165,12 @@ TEST_F(ChromeInvalidationClientTest, InvalidateWithPayload) {
   FireInvalidate("PREFERENCE", 1, "payload");
 }
 
+TEST_F(ChromeInvalidationClientTest, WriteState) {
+  EXPECT_CALL(mock_invalidation_state_tracker_,
+              SetInvalidationState(kNewState));
+  client_.WriteState(kNewState);
+}
+
 TEST_F(ChromeInvalidationClientTest, InvalidateVersion) {
   using ::testing::Mock;