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

sync/notifier/invalidation_notifier_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/notifier_options.h"
@@ skipping 17 matching lines @@
  protected:
   virtual void SetUp() {
     notifier::NotifierOptions notifier_options;
     // Note: URLRequestContextGetters are ref-counted.
     notifier_options.request_context_getter =
         new TestURLRequestContextGetter(message_loop_.message_loop_proxy());
     invalidation_notifier_.reset(
         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"));
     invalidation_notifier_->AddObserver(&mock_observer_);
   }
 
   virtual void TearDown() {
     invalidation_notifier_->RemoveObserver(&mock_observer_);
     // Stopping the invalidation notifier stops its scheduler, which deletes any
     // pending tasks without running them.  Some tasks "run and delete" another
     // task, so they must be run in order to avoid leaking the inner task.
     // Stopping does not schedule any tasks, so it's both necessary and
@@ skipping 16 matching lines @@
 #endif
 TEST_F(InvalidationNotifierTest, MAYBE_Basic) {
   InSequence dummy;
 
   syncable::ModelTypePayloadMap type_payloads;
   type_payloads[syncable::PREFERENCES] = "payload";
   type_payloads[syncable::BOOKMARKS] = "";
   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.
   invalidation_notifier_->OnDisconnect();
   invalidation_notifier_->OnConnect(fake_base_task_.AsWeakPtr());
 
   invalidation_notifier_->OnSessionStatusChanged(false);
 }
 
 }  // namespace
 
 }  // namespace sync_notifier