Refactor common invalidation framework types

chrome/browser/invalidation/fake_invalidation_service.cc

 // Copyright 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/fake_invalidation_service.h"
 
 #include "chrome/browser/invalidation/invalidation_service_util.h"
 
 namespace invalidation {
 
@@ skipping 47 matching lines @@
 
 std::string FakeInvalidationService::GetInvalidatorClientId() const {
   return client_id_;
 }
 
 void FakeInvalidationService::SetInvalidatorState(
     syncer::InvalidatorState state) {
   invalidator_registrar_.UpdateInvalidatorState(state);
 }
 
-syncer::AckHandle FakeInvalidationService::EmitInvalidationForTest(
-      const invalidation::ObjectId& object_id,
-      int64 version,
-      const std::string& payload) {
+void FakeInvalidationService::EmitInvalidationForTest(
+    const syncer::Invalidation& invalidation) {
   syncer::ObjectIdInvalidationMap invalidation_map;
 
-  syncer::Invalidation inv;
-  inv.version = version;
-  inv.payload = payload;
-  inv.ack_handle = syncer::AckHandle::CreateUnique();
-
-  invalidation_map.insert(std::make_pair(object_id, inv));
+  invalidation_map.Insert(invalidation);
   unacknowledged_handles_.push_back(
-      AckHandleList::value_type(inv.ack_handle, object_id));
+      AckHandleList::value_type(
+          invalidation.ack_handle(),
+          invalidation.object_id()));
 
   invalidator_registrar_.DispatchInvalidationsToHandlers(invalidation_map);
-
-  return inv.ack_handle;
 }
 
 bool FakeInvalidationService::IsInvalidationAcknowledged(
     const syncer::AckHandle& ack_handle) const {
   // Try to find the given handle in the acknowledged list.
   AckHandleList::const_iterator begin = acknowledged_handles_.begin();
   AckHandleList::const_iterator end = acknowledged_handles_.end();
   for (AckHandleList::const_iterator handle = begin; handle != end; ++handle)
     if (handle->first.Equals(ack_handle))
       return true;
   return false;
 }
 
 }  // namespace invalidation