diff options
| author | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 14:37:52 +0000 |
|---|---|---|
| committer | eugenis@chromium.org <eugenis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 14:37:52 +0000 |
| commit | 27281b8163fd963c6e3b69c0ef4e3e895b06c924 (patch) | |
| tree | acdd0e197cdc4614acd5d568b046ae25af119348 /apps | |
| parent | 101e2a6e4139710896c564232f77b68250c2d3ec (diff) | |
| download | chromium_src-27281b8163fd963c6e3b69c0ef4e3e895b06c924.zip chromium_src-27281b8163fd963c6e3b69c0ef4e3e895b06c924.tar.gz chromium_src-27281b8163fd963c6e3b69c0ef4e3e895b06c924.tar.bz2 | |
Revert 200220 "Make ExtensionPrefs a ProfileKeyedService."
Multiple leaks on both heapcheck bots.
> Make ExtensionPrefs a ProfileKeyedService.
>
> BUG=178218
> TBR=asargent@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/14999009
TBR=yoz@chromium.org
Review URL: https://codereview.chromium.org/14772045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_restore_service_browsertest.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index ce800a4..a335617e 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -7,6 +7,8 @@ #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" @@ -33,7 +35,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, RunningAppsAreRecorded) { const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("platform_apps/restart_test")); ASSERT_TRUE(extension); - ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(browser()->profile()); + ExtensionService* extension_service = + ExtensionSystem::Get(browser()->profile())->extension_service(); + ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); // App is running. ASSERT_TRUE(extension_prefs->IsExtensionRunning(extension->id())); @@ -79,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsSavedToPrefs) { file_written_listener.WaitUntilSatisfied(); ExtensionPrefs* extension_prefs = - ExtensionPrefs::Get(browser()->profile()); + ExtensionSystem::Get(browser()->profile())->extension_prefs(); // Record the file entries in prefs because when the app gets suspended it // will have them all cleared. @@ -123,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) { file_written_listener.WaitUntilSatisfied(); ExtensionPrefs* extension_prefs = - ExtensionPrefs::Get(browser()->profile()); + ExtensionSystem::Get(browser()->profile())->extension_prefs(); // Record the file entries in prefs because when the app gets suspended it // will have them all cleared. std::vector<SavedFileEntry> file_entries; |