summaryrefslogtreecommitdiffstats
path: root/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 16:55:35 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 16:55:35 +0000
commitd03d2e1c530c0329de57e31e76390defe6cad676 (patch)
treedabe4be9eeb91d810ba2e8daea1995c88acee42d /chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
parent9ba666117ed56d6ff4b1e058f9027798faa31b22 (diff)
downloadchromium_src-d03d2e1c530c0329de57e31e76390defe6cad676.zip
chromium_src-d03d2e1c530c0329de57e31e76390defe6cad676.tar.gz
chromium_src-d03d2e1c530c0329de57e31e76390defe6cad676.tar.bz2
Introduce ProfileInvalidationProvider wrapper for InvalidationService
TiclInvalidationService was refactored to no longer depend on Profile. However, it still is a KeyedService. While this does actually pull in Profile as a dependency, it implies that TiclInvalidationService should be considered a per-Profile service, like the other KeyedServices in Chrome's code base. This CL introduces ProfileInvalidationProvider, a KeyedService that is a tiny wrapper around an InvalidationService. Given this wrapper, InvalidationService (and with it, TiclInvalidationService) no longer have to be KeyedServices. BUG=362083 TEST=Updated unit and browser tests TBR=dcheng (chrome/browser/extensions/api/push_messaging/*) TBR=davemoore (chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc) TBR=arv (chrome/browser/ui/webui/invalidations_message_handler.cc) Review URL: https://codereview.chromium.org/327243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc')
-rw-r--r--chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
index f0e0dbe..51ec0ba 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
+++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc
@@ -63,7 +63,7 @@ void TiclProfileSettingsProviderTest::SetUp() {
}
void TiclProfileSettingsProviderTest::TearDown() {
- invalidation_service_->Shutdown();
+ invalidation_service_.reset();
}
TiclInvalidationService::InvalidationNetworkChannel