[Sync] Rework Invalidator-related unit tests

sync/notifier/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.
 //
 // Interface to the invalidator, which is an object that receives
 // invalidations for registered object IDs. The corresponding
 // InvalidationHandler is notifier when such an event occurs.
 
 #ifndef SYNC_NOTIFIER_INVALIDATOR_H_
 #define SYNC_NOTIFIER_INVALIDATOR_H_
 
 #include <string>
 
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/object_id_state_map.h"
 
 namespace syncer {
 class InvalidationHandler;
 
 class Invalidator {
  public:
   Invalidator() {}
   virtual ~Invalidator() {}
 
   // Clients should follow the pattern below:
@@ skipping 49 matching lines @@
   // The observers won't be notified of any notifications until
   // UpdateCredentials is called at least once. It can be called more than
   // once.
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) = 0;
 
   // This is here only to support the old p2p notification implementation,
   // which is still used by sync integration tests.
   // TODO(akalin): Remove this once we move the integration tests off p2p
   // notifications.
-  virtual void SendNotification(ModelTypeSet changed_types) = 0;
+  virtual void SendNotification(const ObjectIdStateMap& id_state_map) = 0;
 };
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_H_