Introduce ProfileInvalidationProvider wrapper for InvalidationService

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"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
-#include "chrome/browser/invalidation/invalidation_service_factory.h"
+#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/invalidation/fake_invalidator.h"
 #include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/keyed_service/core/keyed_service.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/internal_api/public/base/invalidation.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 using ::testing::_;
 
-using invalidation::InvalidationServiceFactory;
+namespace content {
+class BrowserContext;
+}
 
 namespace extensions {
 
 namespace {
 
 invalidation::ObjectId ExtensionAndSubchannelToObjectId(
     const std::string& extension_id, int subchannel_id) {
   return invalidation::ObjectId(
       ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
       base::StringPrintf("U/%s/%d", extension_id.c_str(), subchannel_id));
 }
 
+KeyedService* BuildFakeProfileInvalidationProvider(
+    content::BrowserContext* context) {
+  return new invalidation::ProfileInvalidationProvider(
+      scoped_ptr<invalidation::InvalidationService>(
+          new invalidation::FakeInvalidationService));
+}
+
 class MockInvalidationMapper : public PushMessagingInvalidationMapper {
  public:
   MockInvalidationMapper();
   ~MockInvalidationMapper();
 
   MOCK_METHOD1(SuppressInitialInvalidationsForExtension,
                void(const std::string&));
   MOCK_METHOD1(RegisterExtension, void(const std::string&));
   MOCK_METHOD1(UnregisterExtension, void(const std::string&));
 };
 
 MockInvalidationMapper::MockInvalidationMapper() {}
 MockInvalidationMapper::~MockInvalidationMapper() {}
 
 }  // namespace
 
 class PushMessagingApiTest : public ExtensionApiTest {
  public:
   PushMessagingApiTest()
       : fake_invalidation_service_(NULL) {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
   }
 
   virtual void SetUp() OVERRIDE {
-    InvalidationServiceFactory::GetInstance()->RegisterTestingFactory(
-        invalidation::FakeInvalidationService::Build);
+    invalidation::ProfileInvalidationProviderFactory::GetInstance()->
+        RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
     ExtensionApiTest::SetUp();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
     fake_invalidation_service_ =
         static_cast<invalidation::FakeInvalidationService*>(
-            InvalidationServiceFactory::GetInstance()->GetForProfile(
-                profile()));
+            static_cast<invalidation::ProfileInvalidationProvider*>(
+                invalidation::ProfileInvalidationProviderFactory::
+                    GetInstance()->GetForProfile(profile()))->
+                        GetInvalidationService());
   }
 
   void EmitInvalidation(
       const invalidation::ObjectId& object_id,
       int64 version,
       const std::string& payload) {
     fake_invalidation_service_->EmitInvalidationForTest(
         syncer::Invalidation::Init(object_id, version, payload));
   }
 
@@ skipping 98 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