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

sync/notifier/invalidation_notifier_unittest.cc

Index: sync/notifier/invalidation_notifier_unittest.cc
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 00db644efe75c60e8225c94f1d8e53778c824990..1c24737a1a5a32b42af31c0b46655d4b2d32bc18 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -35,6 +35,7 @@ class InvalidationNotifierTest : public testing::Test {
         new InvalidationNotifier(
             notifier_options,
             InvalidationVersionMap(),
+            std::string(),  // initial_invalidation_state
             browser_sync::MakeWeakHandle(
                 base::WeakPtr<InvalidationStateTracker>()),

[Nicolas Zea, 2012/05/29 23:32:53]

Seems like this would be a good place to test the logic. Passing in a mock/fake
here, and ensuring it only gets called once if the initial state was empty,
never otherwise.

[tim (not reviewing), 2012/05/30 02:02:47]

Done, thanks!

             "fake_client_info"));
@@ -73,21 +74,18 @@ TEST_F(InvalidationNotifierTest, MAYBE_Basic) {
   type_payloads[syncable::AUTOFILL] = "";
 
   EXPECT_CALL(mock_observer_, OnNotificationStateChange(true));
-  EXPECT_CALL(mock_observer_, StoreState("new_fake_state"));
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(type_payloads,
                                      REMOTE_NOTIFICATION));
   EXPECT_CALL(mock_observer_, OnNotificationStateChange(false));
 
-  invalidation_notifier_->SetState("fake_state");
+  invalidation_notifier_->SetStateDeprecated("fake_state");
   invalidation_notifier_->SetUniqueId("fake_id");
   invalidation_notifier_->UpdateCredentials("foo@bar.com", "fake_token");
 
   invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr());
   invalidation_notifier_->OnSessionStatusChanged(true);
 
-  invalidation_notifier_->WriteState("new_fake_state");
-
   invalidation_notifier_->OnInvalidate(type_payloads);
 
   // Shouldn't trigger notification state change.