Invalidation trickles mega-patch

chrome/browser/sync/glue/sync_backend_host.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_GLUE_SYNC_BACKEND_HOST_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 487 matching lines @@
       syncer::PassphraseType type,
       base::Time explicit_passphrase_time);
 
   void HandleStopSyncingPermanentlyOnFrontendLoop();
 
   // Dispatched to from OnConnectionStatusChange to handle updating
   // frontend UI components.
   void HandleConnectionStatusChangeOnFrontendLoop(
       syncer::ConnectionStatus status);
 
-  // syncer::InvalidationHandler-like functions.
-  void HandleInvalidatorStateChangeOnFrontendLoop(
-      syncer::InvalidatorState state);
-  void HandleIncomingInvalidationOnFrontendLoop(
-      const syncer::ObjectIdInvalidationMap& invalidation_map);
-
   // NotificationObserver implementation.
   virtual void Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) OVERRIDE;
 
   // InvalidationHandler implementation.
   virtual void OnInvalidatorStateChange(
       syncer::InvalidatorState state) OVERRIDE;
   virtual void OnIncomingInvalidation(
-      const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
+      const syncer::ObjectIdInvalidationMap& invalidations) OVERRIDE;
 
   // Handles stopping the core's SyncManager, accounting for whether
   // initialization is done yet.
   void StopSyncManagerForShutdown();
 
   base::WeakPtrFactory<SyncBackendHost> weak_ptr_factory_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // A reference to the MessageLoop used to construct |this|, so we know how
@@ skipping 53 matching lines @@
 
   invalidation::InvalidationService* invalidator_;
   bool invalidation_handler_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHost);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_H_