Remove syncer::IncomingInvalidationSource

chrome/browser/sync/glue/android_invalidator_bridge.cc

 // 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.
 
 #include "chrome/browser/sync/glue/android_invalidator_bridge.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 19 matching lines @@
 
   void InitializeOnSyncThread();
   void CleanupOnSyncThread();
 
   void RegisterHandler(syncer::InvalidationHandler* handler);
   void UpdateRegisteredIds(syncer::InvalidationHandler* handler,
                            const syncer::ObjectIdSet& ids);
   void UnregisterHandler(syncer::InvalidationHandler* handler);
 
   void EmitInvalidation(
-      const syncer::ObjectIdInvalidationMap& invalidation_map,
-      syncer::IncomingInvalidationSource invalidation_source);
+      const syncer::ObjectIdInvalidationMap& invalidation_map);
 
   bool IsHandlerRegisteredForTest(syncer::InvalidationHandler* handler) const;
   syncer::ObjectIdSet GetRegisteredIdsForTest(
       syncer::InvalidationHandler* handler) const;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
 
   // Destroyed on the UI thread or on |sync_task_runner_|.
   ~Core();
@@ skipping 38 matching lines @@
   invalidator_registrar_->UpdateRegisteredIds(handler, ids);
 }
 
 void AndroidInvalidatorBridge::Core::UnregisterHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   invalidator_registrar_->UnregisterHandler(handler);
 }
 
 void AndroidInvalidatorBridge::Core::EmitInvalidation(
-    const syncer::ObjectIdInvalidationMap& invalidation_map,
-    syncer::IncomingInvalidationSource invalidation_source) {
+    const syncer::ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   const syncer::ObjectIdInvalidationMap& effective_invalidation_map =
       invalidation_map.empty() ?
       ObjectIdSetToInvalidationMap(
           invalidator_registrar_->GetAllRegisteredIds(), std::string()) :
       invalidation_map;
 
   invalidator_registrar_->DispatchInvalidationsToHandlers(
-      effective_invalidation_map, invalidation_source);
+      effective_invalidation_map);
 }
 
 bool AndroidInvalidatorBridge::Core::IsHandlerRegisteredForTest(
     syncer::InvalidationHandler* handler) const {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
   return invalidator_registrar_->IsHandlerRegisteredForTest(handler);
 }
 
 syncer::ObjectIdSet
 AndroidInvalidatorBridge::Core::GetRegisteredIdsForTest(
@@ skipping 70 matching lines @@
   return core_->GetRegisteredIdsForTest(handler);
 }
 
 void AndroidInvalidatorBridge::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(type, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE);
 
-  syncer::IncomingInvalidationSource invalidation_source =
-      syncer::REMOTE_INVALIDATION;
-
   // TODO(akalin): Use ObjectIdInvalidationMap here instead.  We'll have to
   // make sure all emitters of the relevant notifications also use
   // ObjectIdInvalidationMap.
   content::Details<const syncer::ModelTypeInvalidationMap>
       state_details(details);
   const syncer::ModelTypeInvalidationMap& invalidation_map =
       *(state_details.ptr());
   if (!sync_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&Core::EmitInvalidation,
                      core_,
                      ModelTypeInvalidationMapToObjectIdInvalidationMap(
-                         invalidation_map),
-                     invalidation_source))) {
+                         invalidation_map)))) {
     NOTREACHED();
   }
 }
 
 }  // namespace browser_sync