#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.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.h"
+#include "components/invalidation/invalidation_service.h"
+#include "components/invalidation/profile_invalidation_provider.h"
+#include "components/keyed_service/core/keyed_service.h"
+#include "extensions/test/extension_test_message_listener.h"
+#include "extensions/test/result_catcher.h"
#include "google/cacheinvalidation/types.pb.h"
-#include "sync/notifier/fake_invalidator.h"
#include "testing/gmock/include/gmock/gmock.h"
-using ::testing::_;
using ::testing::SaveArg;
using ::testing::StrictMock;
+using ::testing::_;
-using invalidation::InvalidationServiceFactory;
+namespace content {
+class BrowserContext;
+}
namespace extensions {
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();
}
virtual void SetUp() OVERRIDE {
- InvalidationServiceFactory::GetInstance()->
- SetBuildOnlyFakeInvalidatorsForTest(true);
+ invalidation::ProfileInvalidationProviderFactory::GetInstance()->
+ RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
ExtensionApiTest::SetUp();
}
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(
IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
ResultCatcher catcher;
- catcher.RestrictToProfile(profile());
+ catcher.RestrictToBrowserContext(profile());
const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
// that we install.
IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, ReceivesPush) {
ResultCatcher catcher;
- catcher.RestrictToProfile(profile());
+ catcher.RestrictToBrowserContext(profile());
const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
// Test that GetChannelId fails if no user is signed in.
IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, GetChannelId) {
ResultCatcher catcher;
- catcher.RestrictToProfile(profile());
+ catcher.RestrictToBrowserContext(profile());
const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("push_messaging"));