[Sync] Rework Invalidator-related unit tests

sync/notifier/p2p_invalidator.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.
 //
 // An invalidator that uses p2p notifications based on XMPP push
 // notifications.  Used only for sync integration tests.
 
 #ifndef SYNC_NOTIFIER_P2P_INVALIDATOR_H_
 #define SYNC_NOTIFIER_P2P_INVALIDATOR_H_
 
@@ skipping 11 matching lines @@
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/notifications_disabled_reason.h"
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 // The channel to use for sync notifications.
-extern const char* kSyncP2PNotificationChannel;
+extern const char kSyncP2PNotificationChannel[];
 
 // The intended recipient(s) of a P2P notification.
 enum P2PNotificationTarget {
   NOTIFY_SELF,
   FIRST_NOTIFICATION_TARGET = NOTIFY_SELF,
   NOTIFY_OTHERS,
   NOTIFY_ALL,
   LAST_NOTIFICATION_TARGET = NOTIFY_ALL
 };
 
 std::string P2PNotificationTargetToString(
     P2PNotificationTarget target);
 
 // If |target_str| can't be parsed, assumes NOTIFY_SELF.
 P2PNotificationTarget P2PNotificationTargetFromString(
     const std::string& target_str);
 
 // Helper notification data class that can be serialized to and
 // deserialized from a string.
 class P2PNotificationData {
  public:
   // Initializes with an empty sender ID, target set to NOTIFY_SELF,
   // and empty changed types.
   P2PNotificationData();
   P2PNotificationData(const std::string& sender_id,
                       P2PNotificationTarget target,
-                      ModelTypeSet changed_types);
+                      const ObjectIdStateMap& id_state_map,
+                      IncomingNotificationSource source);
 
   ~P2PNotificationData();
 
   // Returns true if the given ID is targeted by this notification.
   bool IsTargeted(const std::string& id) const;
 
-  ModelTypeSet GetChangedTypes() const;
+  const ObjectIdStateMap& GetIdStateMap() const;
+
+  IncomingNotificationSource GetSource() const;
 
   bool Equals(const P2PNotificationData& other) const;
 
   std::string ToString() const;
 
   // Returns whether parsing |str| was successful.  If parsing was
   // unsuccessful, the state of the notification is undefined.
   bool ResetFromString(const std::string& str);
 
  private:
   // The unique ID of the client that sent the notification.
   std::string sender_id_;
   // The intendent recipient(s) of the notification.
   P2PNotificationTarget target_;
-  // The types the notification is for.
-  ModelTypeSet changed_types_;
+  // The state map for the notification.
+  ObjectIdStateMap id_state_map_;
+  // The source of the notification.
+  IncomingNotificationSource source_;
 };
 
 class P2PInvalidator : public Invalidator,
                        public notifier::PushClientObserver {
  public:
   // The |send_notification_target| parameter was added to allow us to send
   // self-notifications in some cases, but not others.  The value should be
   // either NOTIFY_ALL to send notifications to all clients, or NOTIFY_OTHERS
   // to send notifications to all clients except for the one that triggered the
   // notification.  See crbug.com/97780.
   P2PInvalidator(scoped_ptr<notifier::PushClient> push_client,
                  P2PNotificationTarget send_notification_target);
 
   virtual ~P2PInvalidator();
 
   // Invalidator implementation
   virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
-  virtual void SendNotification(ModelTypeSet changed_types) OVERRIDE;
+  virtual void SendNotification(const ObjectIdStateMap& id_state_map) OVERRIDE;
 
   // PushClientObserver implementation.
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       notifier::NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
       const notifier::Notification& notification) OVERRIDE;
 
   void SendNotificationDataForTest(
       const P2PNotificationData& notification_data);
 
  private:
   void SendNotificationData(const P2PNotificationData& notification_data);
 
   base::ThreadChecker thread_checker_;
 
   InvalidatorRegistrar registrar_;
 
   // The push client.
   scoped_ptr<notifier::PushClient> push_client_;
   // Our unique ID.
   std::string unique_id_;
   // Whether we have called UpdateCredentials() yet.
   bool logged_in_;
   bool notifications_enabled_;
   // Which set of clients should be sent notifications.
   P2PNotificationTarget send_notification_target_;
 
-  ModelTypeSet enabled_types_;
-
   DISALLOW_COPY_AND_ASSIGN(P2PInvalidator);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_P2P_INVALIDATOR_H_