From 06bdd2b628b4b76a3bd6fc8dff5b219f0950663c Mon Sep 17 00:00:00 2001 From: "mirandac@chromium.org" Date: Fri, 30 Nov 2012 18:47:13 +0000 Subject: Remove GetExtensionService calls and replace with PKSF calls through the ExtensionSystem. Extension services were made into ProfileKeyedServices a while ago; this replaces the deprecated calls that ran directly through the Profile object. This is about half of the total GetExtensionService calls in the codebase, but this CL is already ridiculously large. BUG= http://code.google.com/p/chromium/issues/detail?id=104095 Review URL: https://chromiumcodereview.appspot.com/11365181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170497 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/plugin_apitest.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chrome/browser/extensions/plugin_apitest.cc') diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 136f7e8..d776bc2 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -48,7 +49,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); EXPECT_FALSE(result); - ExtensionService* service = browser()->profile()->GetExtensionService(); + ExtensionService* service = extensions::ExtensionSystem::Get( + browser()->profile())->extension_service(); service->set_show_extensions_prompts(false); const size_t size_before = service->extensions()->size(); const Extension* extension = LoadExtension(extension_dir); @@ -104,7 +106,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { FilePath extension_dir = test_data_dir_.AppendASCII("uitest").AppendASCII("plugins_private"); - ExtensionService* service = browser()->profile()->GetExtensionService(); + ExtensionService* service = extensions::ExtensionSystem::Get( + browser()->profile())->extension_service(); service->set_show_extensions_prompts(false); const size_t size_before = service->extensions()->size(); const Extension* extension = LoadExtension(extension_dir); -- cgit v1.1