Refactor common invalidation framework types

chrome/browser/extensions/api/push_messaging/push_messaging_apitest.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/extensions/api/push_messaging/push_messaging_api.h"
 
 #include "apps/launcher.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h"
@@ skipping 62 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
     fake_invalidation_service_ =
         static_cast<invalidation::FakeInvalidationService*>(
             InvalidationServiceFactory::GetInstance()->GetForProfile(
                 profile()));
   }
 
   void EmitInvalidation(
       const invalidation::ObjectId& object_id,
+      int64 version,
       const std::string& payload) {
     fake_invalidation_service_->EmitInvalidationForTest(
-        object_id,
-        syncer::Invalidation::kUnknownVersion,
-        payload);
+        syncer::Invalidation::Init(object_id, version, payload));
   }
 
   PushMessagingAPI* GetAPI() {
     return PushMessagingAPI::Get(profile());
   }
 
   PushMessagingEventRouter* GetEventRouter() {
     return PushMessagingAPI::Get(profile())->GetEventRouterForTest();
   }
 
@@ skipping 24 matching lines @@
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
   ASSERT_TRUE(extension);
   ui_test_utils::NavigateToURL(
       browser(), extension->GetResourceURL("event_dispatch.html"));
 
   // PushMessagingInvalidationHandler suppresses the initial invalidation on
   // each subchannel at install, so trigger the suppressions first.
   for (int i = 0; i < 3; ++i) {
     EmitInvalidation(
-        ExtensionAndSubchannelToObjectId(extension->id(), i), std::string());
+        ExtensionAndSubchannelToObjectId(extension->id(), i), i, std::string());
   }
 
   EmitInvalidation(
-      ExtensionAndSubchannelToObjectId(extension->id(), 1), "payload");
+      ExtensionAndSubchannelToObjectId(extension->id(), 1), 5, "payload");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 // Checks that an extension with the pushMessaging permission gets automatically
 // registered for invalidations when it is loaded.
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, AutoRegistration) {
   scoped_ptr<StrictMock<MockInvalidationMapper> > mapper(
       new StrictMock<MockInvalidationMapper>);
   StrictMock<MockInvalidationMapper>* unsafe_mapper = mapper.get();
   // PushMessagingEventRouter owns the mapper now.
@@ skipping 41 matching lines @@
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
   ASSERT_TRUE(extension);
   ui_test_utils::NavigateToURL(
       browser(), extension->GetResourceURL("get_channel_id.html"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace extensions