Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/sync/test_profile_sync_service.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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 48 matching lines @@
       const syncer::WeakHandle<syncer::JsBackend>& js_backend,
       bool success,
       syncer::ModelTypeSet restored_types) OVERRIDE;
 
   static void SetHistoryServiceExpectations(ProfileMock* profile);
 
   void SetInitialSyncEndedForAllTypes();
 
   void EmitOnInvalidatorStateChange(syncer::InvalidatorState state);
   void EmitOnIncomingInvalidation(
-      const syncer::ObjectIdStateMap& id_state_map,
+      const syncer::ObjectIdInvalidationMap& invalidation_map,
       const syncer::IncomingInvalidationSource source);
 
  protected:
   virtual void InitCore(const DoInitializeOptions& options) OVERRIDE;
 
  private:
   syncer::TestIdFactory& id_factory_;
   base::Closure& callback_;
 
   bool set_initial_sync_ended_on_init_;
@@ skipping 59 matching lines @@
   bool synchronous_sync_configuration_;
 
   base::Closure callback_;
   bool set_initial_sync_ended_on_init_;
 
   bool fail_initial_download_;
   syncer::StorageOption storage_option_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_