Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/chrome_to_mobile_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_CHROME_TO_MOBILE_SERVICE_H_
 #define CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 155 matching lines @@
 
   // OAuth2AccessTokenConsumer methods.
   virtual void OnGetTokenSuccess(const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
 
   // syncer::InvalidationHandler implementation.
   virtual void OnInvalidatorStateChange(
       syncer::InvalidatorState state) OVERRIDE;
   virtual void OnIncomingInvalidation(
-      const syncer::ObjectIdStateMap& id_state_map,
+      const syncer::ObjectIdInvalidationMap& invalidation_map,
       syncer::IncomingInvalidationSource source) OVERRIDE;
 
   // Expose access token accessors for test purposes.
   const std::string& GetAccessTokenForTest() const;
   void SetAccessTokenForTest(const std::string& access_token);
 
  private:
   friend class MockChromeToMobileService;
 
   // Enable or disable Chrome To Mobile with the browsers' command controllers.
@@ skipping 62 matching lines @@
   base::OneShotTimer<ChromeToMobileService> auth_retry_timer_;
   base::OneShotTimer<ChromeToMobileService> search_retry_timer_;
 
   // A queue of tasks to perform after an access token is lazily initialized.
   std::queue<base::Closure> task_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeToMobileService);
 };
 
 #endif  // CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_