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

sync/notifier/non_blocking_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/non_blocking_invalidation_notifier.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
@@ skipping 24 matching lines @@
     options.message_loop_type = MessageLoop::TYPE_IO;
     io_thread_.StartWithOptions(options);
     request_context_getter_ =
         new TestURLRequestContextGetter(io_thread_.message_loop_proxy());
     notifier::NotifierOptions notifier_options;
     notifier_options.request_context_getter = request_context_getter_;
     invalidation_notifier_.reset(
         new NonBlockingInvalidationNotifier(
             notifier_options,
             InvalidationVersionMap(),
+            std::string(),  // initial_invalidation_state
             browser_sync::MakeWeakHandle(
                 base::WeakPtr<sync_notifier::InvalidationStateTracker>()),
             "fake_client_info"));
     invalidation_notifier_->AddObserver(&mock_observer_);
   }
 
   virtual void TearDown() {
     invalidation_notifier_->RemoveObserver(&mock_observer_);
     invalidation_notifier_.reset();
     request_context_getter_ = NULL;
@@ skipping 11 matching lines @@
 
 TEST_F(NonBlockingInvalidationNotifierTest, 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_->OnNotificationStateChange(true);
-  invalidation_notifier_->StoreState("new_fake_state");
   invalidation_notifier_->OnIncomingNotification(type_payloads,
                                                  REMOTE_NOTIFICATION);
   invalidation_notifier_->OnNotificationStateChange(false);
 
   ui_loop_.RunAllPending();
 }
 
 }  // namespace
 
 }  // namespace sync_notifier