Refactor common invalidation framework types

chrome/browser/invalidation/fake_invalidation_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_INVALIDATION_FAKE_INVALIDATION_SERVICE_H_
 #define CHROME_BROWSER_INVALIDATION_FAKE_INVALIDATION_SERVICE_H_
 
 #include <list>
 #include <utility>
 
@@ skipping 23 matching lines @@
       const syncer::AckHandle& ack_handle) OVERRIDE;
 
   virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual std::string GetInvalidatorClientId() const OVERRIDE;
 
   void SetInvalidatorState(syncer::InvalidatorState state);
 
   const syncer::InvalidatorRegistrar& invalidator_registrar() const {
     return invalidator_registrar_;
   }
-  syncer::AckHandle EmitInvalidationForTest(
-      const invalidation::ObjectId& object_id,
-      int64 version,
-      const std::string& payload);
+  void EmitInvalidationForTest(const syncer::Invalidation& invalidation);
 
   // Determines if the given AckHandle has been acknowledged.
   bool IsInvalidationAcknowledged(const syncer::AckHandle& ack_handle) const;
 
   // Determines if AcknowledgeInvalidation was ever called with an invalid
   // ObjectId/AckHandle pair.
   bool ReceivedInvalidAcknowledgement() {
     return received_invalid_acknowledgement_;
   }
 
  private:
   std::string client_id_;
   syncer::InvalidatorRegistrar invalidator_registrar_;
   typedef std::list<std::pair<syncer::AckHandle, invalidation::ObjectId> >
       AckHandleList;
   AckHandleList unacknowledged_handles_;
   AckHandleList acknowledged_handles_;
   bool received_invalid_acknowledgement_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeInvalidationService);
 };
 
 }  // namespace invalidation
 
 #endif  // CHROME_BROWSER_INVALIDATION_FAKE_INVALIDATION_SERVICE_H_