[Sync] Rework Invalidator-related unit tests

sync/notifier/fake_invalidator.h

Index: sync/notifier/fake_invalidator.h
diff --git a/sync/notifier/fake_invalidator.h b/sync/notifier/fake_invalidator.h
index 26c5ad857eb836d7771a552c9d64f037e3caaf22..07690ddf685fd64e0b97d57c5648e59b6070655c 100644
--- a/sync/notifier/fake_invalidator.h
+++ b/sync/notifier/fake_invalidator.h
@@ -25,7 +25,12 @@ class FakeInvalidator : public Invalidator {
   const std::string& GetStateDeprecated() const;
   const std::string& GetCredentialsEmail() const;
   const std::string& GetCredentialsToken() const;
-  ModelTypeSet GetLastChangedTypes() const;
+  const ObjectIdStateMap& GetLastSentIdStateMap() const;
+
+  void EmitOnNotificationsEnabled();
+  void EmitOnIncomingNotification(const ObjectIdStateMap& id_state_map,
+                                  IncomingNotificationSource source);
+  void EmitOnNotificationsDisabled(NotificationsDisabledReason reason);
 
   virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
@@ -35,7 +40,7 @@ class FakeInvalidator : public Invalidator {
   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;
 
  private:
   InvalidatorRegistrar registrar_;
@@ -43,7 +48,7 @@ class FakeInvalidator : public Invalidator {
   std::string state_;
   std::string email_;
   std::string token_;
-  ModelTypeSet last_changed_types_;
+  ObjectIdStateMap last_sent_id_state_map_;
 };
 
 }  // namespace syncer