diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 09:21:12 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 09:21:12 +0000 |
| commit | 2d30d04ecb2e82011ce317f855967cf7f4cc5213 (patch) | |
| tree | 9c1a640683e27200139fe15f04a90dd0f52fc919 /apps/app_restore_service_browsertest.cc | |
| parent | 08d7b2796ca0ee39154410a76fb298e1bda23fea (diff) | |
| download | chromium_src-2d30d04ecb2e82011ce317f855967cf7f4cc5213.zip chromium_src-2d30d04ecb2e82011ce317f855967cf7f4cc5213.tar.gz chromium_src-2d30d04ecb2e82011ce317f855967cf7f4cc5213.tar.bz2 | |
Make ExtensionPrefs a ProfileKeyedService.
BUG=178218
TBR=asargent@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14999009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_restore_service_browsertest.cc')
| -rw-r--r-- | apps/app_restore_service_browsertest.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index a335617e..ce800a4 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -7,8 +7,6 @@ #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/common/extensions/extension.h" @@ -35,9 +33,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, RunningAppsAreRecorded) { const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("platform_apps/restart_test")); ASSERT_TRUE(extension); - ExtensionService* extension_service = - ExtensionSystem::Get(browser()->profile())->extension_service(); - ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); + ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser()->profile()); // App is running. ASSERT_TRUE(extension_prefs->IsExtensionRunning(extension->id())); @@ -83,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsSavedToPrefs) { file_written_listener.WaitUntilSatisfied(); ExtensionPrefs* extension_prefs = - ExtensionSystem::Get(browser()->profile())->extension_prefs(); + ExtensionPrefs::Get(browser()->profile()); // Record the file entries in prefs because when the app gets suspended it // will have them all cleared. @@ -127,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) { file_written_listener.WaitUntilSatisfied(); ExtensionPrefs* extension_prefs = - ExtensionSystem::Get(browser()->profile())->extension_prefs(); + ExtensionPrefs::Get(browser()->profile()); // Record the file entries in prefs because when the app gets suspended it // will have them all cleared. std::vector<SavedFileEntry> file_entries; |