Invalidation trickles mega-patch

chrome/browser/invalidation/invalidation_service_android.cc

 // Copyright (c) 2013 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/invalidation/invalidation_service_android.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace invalidation {
 
 InvalidationServiceAndroid::InvalidationServiceAndroid(
     Profile* profile,
     InvalidationControllerAndroid* invalidation_controller)
     : invalidator_state_(syncer::INVALIDATIONS_ENABLED),
       invalidation_controller_(invalidation_controller) {
   DCHECK(CalledOnValidThread());
   DCHECK(invalidation_controller);
@@ skipping 17 matching lines @@
   invalidation_controller_->SetRegisteredObjectIds(
       invalidator_registrar_.GetAllRegisteredIds());
 }
 
 void InvalidationServiceAndroid::UnregisterInvalidationHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.UnregisterHandler(handler);
 }
 
-void InvalidationServiceAndroid::AcknowledgeInvalidation(
-    const invalidation::ObjectId& id,
-    const syncer::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
-  // Do nothing.  The Android invalidator does not support ack tracking.
-}
-
 syncer::InvalidatorState
 InvalidationServiceAndroid::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
   return invalidator_state_;
 }
 
 std::string InvalidationServiceAndroid::GetInvalidatorClientId() const {
   DCHECK(CalledOnValidThread());
   // TODO: Return a valid ID here.  See crbug.com/172391.
   return "Bogus";
 }
 
 void InvalidationServiceAndroid::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(type, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE);
 
   content::Details<const syncer::ObjectIdInvalidationMap>
       state_details(details);
   const syncer::ObjectIdInvalidationMap object_invalidation_map =
       *(state_details.ptr());
 
   // An empty map implies that we should invalidate all.
   const syncer::ObjectIdInvalidationMap& effective_invalidation_map =
-      object_invalidation_map.empty() ?
-      ObjectIdSetToInvalidationMap(
-          invalidator_registrar_.GetAllRegisteredIds(),
-          syncer::Invalidation::kUnknownVersion,
-          std::string()) :
+      object_invalidation_map.Empty() ?
+      syncer::ObjectIdInvalidationMap::InvalidateAll(
+          invalidator_registrar_.GetAllRegisteredIds()) :
       object_invalidation_map;
 
   invalidator_registrar_.DispatchInvalidationsToHandlers(
       effective_invalidation_map);
 }
 
 void InvalidationServiceAndroid::TriggerStateChangeForTest(
     syncer::InvalidatorState state) {
   DCHECK(CalledOnValidThread());
   invalidator_state_ = state;
   invalidator_registrar_.UpdateInvalidatorState(invalidator_state_);
 }
 
 } //  namespace invalidation