Refactor common invalidation framework types

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 "content/public/browser/notification_service.h"
 
 namespace invalidation {
@@ skipping 52 matching lines @@
   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