Refactor common invalidation framework types

chrome/browser/sync/profile_sync_service_harness.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/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 486 matching lines @@
 
 void ProfileSyncServiceHarness::OnSyncCycleCompleted() {
   // Integration tests still use p2p notifications.
   const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
   bool is_notifiable_commit =
       (snap.model_neutral_state().num_successful_commits > 0);
   if (is_notifiable_commit && p2p_invalidation_service_) {
     syncer::ModelTypeSet model_types =
         snap.model_neutral_state().commit_request_types;
     syncer::ObjectIdSet ids = ModelTypeSetToObjectIdSet(model_types);
-    syncer::ObjectIdInvalidationMap invalidation_map =
-        syncer::ObjectIdSetToInvalidationMap(
-            ids,
-            syncer::Invalidation::kUnknownVersion,
-            "");
-    p2p_invalidation_service_->SendInvalidation(invalidation_map);
+    p2p_invalidation_service_->SendInvalidation(ids);
   }
 
   OnStateChanged();
 }
 
 void ProfileSyncServiceHarness::OnMigrationStateChange() {
   // Update migration state.
   if (HasPendingBackendMigration()) {
     // Merge current pending migration types into
     // |pending_migration_types_|.
@@ skipping 639 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service_));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }