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

sync/notifier/p2p_notifier.h

 // 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.
 //
 // A notifier that uses p2p notifications based on XMPP push
 // notifications.  Used only for sync integration tests.
 
 #ifndef SYNC_NOTIFIER_P2P_NOTIFIER_H_
 #define SYNC_NOTIFIER_P2P_NOTIFIER_H_
 
@@ skipping 80 matching lines @@
   // notification.  See crbug.com/97780.
   P2PNotifier(scoped_ptr<notifier::PushClient> push_client,
               P2PNotificationTarget send_notification_target);
 
   virtual ~P2PNotifier();
 
   // SyncNotifier implementation
   virtual void AddObserver(SyncNotifierObserver* observer) OVERRIDE;
   virtual void RemoveObserver(SyncNotifierObserver* observer) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
-  virtual void SetState(const std::string& state) OVERRIDE;
+  virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void UpdateEnabledTypes(
       syncable::ModelTypeSet enabled_types) OVERRIDE;
   virtual void SendNotification(
       syncable::ModelTypeSet changed_types) OVERRIDE;
 
   // PushClientObserver implementation.
   virtual void OnNotificationStateChange(bool notifications_enabled) OVERRIDE;
   virtual void OnIncomingNotification(
@@ skipping 20 matching lines @@
   bool notifications_enabled_;
   // Which set of clients should be sent notifications.
   P2PNotificationTarget send_notification_target_;
 
   syncable::ModelTypeSet enabled_types_;
 };
 
 }  // namespace sync_notifier
 
 #endif  // SYNC_NOTIFIER_P2P_NOTIFIER_H_