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
diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc
index 1088494..c37da20 100644
--- a/chrome/browser/autocomplete/keyword_provider.cc
+++ b/chrome/browser/autocomplete/keyword_provider.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -175,11 +176,13 @@
// Don't provide a keyword for inactive/disabled extension keywords.
if (template_url->IsExtensionKeyword()) {
- const extensions::Extension* extension = profile_->GetExtensionService()->
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
+ const extensions::Extension* extension = extension_service->
GetExtensionById(template_url->GetExtensionId(), false);
if (!extension ||
(profile_->IsOffTheRecord() &&
- !profile_->GetExtensionService()->IsIncognitoEnabled(extension->id())))
+ !extension_service->IsIncognitoEnabled(extension->id())))
return string16();
}
@@ -251,7 +254,8 @@
// Prune any extension keywords that are disallowed in incognito mode (if
// we're incognito), or disabled.
if (profile_ && template_url->IsExtensionKeyword()) {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->
+ extension_service();
const extensions::Extension* extension = service->GetExtensionById(
template_url->GetExtensionId(), false);
bool enabled =
diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc
index 6b27e46..6684b48 100644
--- a/chrome/browser/automation/automation_provider_json.cc
+++ b/chrome/browser/automation/automation_provider_json.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/automation/automation_provider.h"
#include "chrome/browser/automation/automation_util.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/automation_id.h"
#include "chrome/common/automation_messages.h"
@@ -189,7 +190,8 @@
*error = base::StringPrintf("Missing or invalid key: %s", key.c_str());
return false;
}
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+ extension_service();
if (!service) {
*error = "No extensions service.";
return false;
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index c137183..50c5bfc 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/history/top_sites.h"
@@ -1918,7 +1919,8 @@
}
// Collect information about the apps in the new tab page.
- ExtensionService* ext_service = automation_->profile()->GetExtensionService();
+ ExtensionService* ext_service = extensions::ExtensionSystem::Get(
+ automation_->profile())->extension_service();
if (!ext_service) {
AutomationJSONReply(automation_, reply_message_.release())
.SendError("No ExtensionService.");
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 144f15b..2e80ada0 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -597,7 +597,8 @@
const extensions::Extension** extension) {
if (id.type() != AutomationId::kTypeExtension)
return false;
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+ extension_service();
const extensions::Extension* installed_extension =
service->GetInstalledExtension(id.id());
if (installed_extension)
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 47036a38..5e3f044a 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -3694,7 +3694,8 @@
}
args->GetBoolean("from_webstore", &from_webstore);
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
ExtensionProcessManager* manager =
extensions::ExtensionSystem::Get(browser->profile())->process_manager();
if (service && manager) {
@@ -3775,7 +3776,8 @@
reply.SendError(error_msg);
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
if (!service) {
reply.SendError("No extensions service.");
return;
@@ -3850,7 +3852,8 @@
AutomationJSONReply(this, reply_message).SendError(error);
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
if (!service) {
AutomationJSONReply(this, reply_message).SendError(
"No extensions service.");
@@ -3902,7 +3905,8 @@
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
ExtensionProcessManager* manager =
extensions::ExtensionSystem::Get(browser->profile())->process_manager();
if (!service) {
@@ -4118,7 +4122,8 @@
AutomationJSONReply(this, reply_message).SendError(error);
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
if (!service) {
AutomationJSONReply(this, reply_message).SendError(
"No extensions service.");
@@ -5015,7 +5020,8 @@
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
if (!service) {
AutomationJSONReply(this, reply_message).SendError(
"No extensions service.");
@@ -5073,7 +5079,8 @@
return;
}
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser->profile())->extension_service();
if (!service) {
reply.SendError("No extensions service.");
return;
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index 3b2faf0..77c5f60 100644
--- a/chrome/browser/background/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/browser_process.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/image_loader.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
@@ -181,7 +182,8 @@
registrar_.Add(this,
chrome::NOTIFICATION_BACKGROUND_CONTENTS_SERVICE_CHANGED,
content::Source<Profile>(profile));
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+ extension_service();
if (service && service->is_ready())
Update();
}
@@ -312,7 +314,8 @@
Update();
return;
}
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->
+ extension_service();
if (!service || !service->is_ready())
return;
@@ -391,7 +394,8 @@
// differs from the old list, it generates OnApplicationListChanged events for
// each observer.
void BackgroundApplicationListModel::Update() {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_)->
+ extension_service();
// Discover current background applications, compare with previous list, which
// is consistently sorted, and notify observers if they differ.
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 14e88c25..b1b1afc7 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -17,6 +17,7 @@
#include "base/stl_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_unittest.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
@@ -122,7 +123,8 @@
// extensions, of which some are Background Apps and others are not.
TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {
InitializeAndLoadEmptyExtensionService();
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->
+ extension_service();
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
@@ -188,7 +190,8 @@
// With minimal test logic, verifies behavior with dynamic permissions.
TEST_F(BackgroundApplicationListModelTest, AddRemovePermissionsTest) {
InitializeAndLoadEmptyExtensionService();
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->
+ extension_service();
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
@@ -337,7 +340,8 @@
// removing extensions, of which some are Background Apps and others are not.
TEST_F(BackgroundApplicationListModelTest, RandomTest) {
InitializeAndLoadEmptyExtensionService();
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->
+ extension_service();
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index e2f9fda..d08e84fd 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
@@ -83,7 +84,8 @@
if (!service->GetAppBackgroundContents(ASCIIToUTF16(extension_id_)))
service->LoadBackgroundContentsForExtension(profile_, extension_id_);
} else {
- profile_->GetExtensionService()->ReloadExtension(extension_id_);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ ReloadExtension(extension_id_);
}
// Closing the balloon here should be OK, but it causes a crash on Mac
@@ -251,7 +253,8 @@
content::Details<BackgroundContents>(details).ptr();
Profile* profile = content::Source<Profile>(source).ptr();
const string16& appid = GetParentApplicationId(bgcontents);
- ExtensionService* extension_service = profile->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
// extension_service can be NULL when running tests.
if (extension_service) {
const Extension* extension =
@@ -272,7 +275,8 @@
// app, then blow away registered urls in the pref.
ShutdownAssociatedBackgroundContents(ASCIIToUTF16(extension->id()));
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (service && service->is_ready()) {
// Now load the manifest-specified background page. If service isn't
// ready, then the background page will be loaded from the
@@ -298,7 +302,8 @@
BackgroundContentsServiceFactory::GetForProfile(profile)->
GetParentApplicationId(bg));
extension =
- profile->GetExtensionService()->GetExtensionById(extension_id, false);
+ extensions::ExtensionSystem::Get(profile)->extension_service()->
+ GetExtensionById(extension_id, false);
} else {
extensions::ExtensionHost* extension_host =
content::Details<extensions::ExtensionHost>(details).ptr();
@@ -370,7 +375,8 @@
prefs_->GetDictionary(prefs::kRegisteredBackgroundContents);
if (!contents)
return;
- ExtensionService* extensions_service = profile->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
DCHECK(extensions_service);
for (DictionaryValue::key_iterator it = contents->begin_keys();
it != contents->end_keys(); ++it) {
@@ -405,7 +411,8 @@
const std::string& extension_id) {
// First look if the manifest specifies a background page.
const Extension* extension =
- profile->GetExtensionService()->GetExtensionById(extension_id, false);
+ extensions::ExtensionSystem::Get(profile)->extension_service()->
+ GetExtensionById(extension_id, false);
DCHECK(!extension || extension->is_hosted_app());
if (extension && extension->has_background_page()) {
LoadBackgroundContents(profile,
@@ -429,7 +436,8 @@
Profile* profile,
const std::string& extension_id,
const DictionaryValue* contents) {
- ExtensionService* extensions_service = profile->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
DCHECK(extensions_service);
const DictionaryValue* dict;
@@ -449,8 +457,8 @@
void BackgroundContentsService::LoadBackgroundContentsFromManifests(
Profile* profile) {
- const ExtensionSet* extensions =
- profile->GetExtensionService()->extensions();
+ const ExtensionSet* extensions = extensions::ExtensionSystem::Get(profile)->
+ extension_service()->extensions();
ExtensionSet::const_iterator iter = extensions->begin();
for (; iter != extensions->end(); ++iter) {
const Extension* extension = *iter;
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 1dcb1bea..06618dc 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -266,7 +267,8 @@
void BackgroundModeManager::LaunchBackgroundApplication(
Profile* profile,
const Extension* extension) {
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+ extension_service();
extension_misc::LaunchContainer launch_container =
service->extension_prefs()->GetLaunchContainer(
extension, extensions::ExtensionPrefs::LAUNCH_REGULAR);
@@ -302,8 +304,10 @@
*extension, profile)) {
// Extensions loaded after the ExtensionsService is ready should be
// treated as new installs.
- if (profile->GetExtensionService()->is_ready())
+ if (extensions::ExtensionSystem::Get(profile)->extension_service()->
+ is_ready()) {
OnBackgroundAppInstalled(extension);
+ }
}
}
break;
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4a836313..223739f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -635,10 +635,12 @@
// installed app, the effective URL is an extension URL with the ID of that
// extension as the host. This has the effect of grouping apps together in
// a common SiteInstance.
- if (!profile || !profile->GetExtensionService())
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (!extension_service)
return url;
- const Extension* extension = profile->GetExtensionService()->extensions()->
+ const Extension* extension = extension_service->extensions()->
GetHostedAppByURL(ExtensionURLInfo(url));
if (!extension)
return url;
@@ -662,10 +664,12 @@
return false;
Profile* profile = Profile::FromBrowserContext(browser_context);
- if (!profile || !profile->GetExtensionService())
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (!extension_service)
return false;
- const Extension* extension = profile->GetExtensionService()->extensions()->
+ const Extension* extension = extension_service->extensions()->
GetExtensionOrAppByURL(ExtensionURLInfo(effective_url));
if (!extension)
return false;
@@ -696,7 +700,8 @@
const GURL& site_url) {
Profile* profile =
Profile::FromBrowserContext(process_host->GetBrowserContext());
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
extensions::ProcessMap* process_map = service->process_map();
// Don't allow the Task Manager to share a process with anything else.
@@ -743,7 +748,8 @@
return false;
Profile* profile = Profile::FromBrowserContext(browser_context);
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return false;
@@ -789,7 +795,8 @@
Profile* profile = Profile::FromBrowserContext(
site_instance->GetBrowserContext());
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return;
@@ -818,7 +825,8 @@
Profile* profile = Profile::FromBrowserContext(
site_instance->GetBrowserContext());
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return;
@@ -915,9 +923,10 @@
if (process) {
Profile* profile = Profile::FromBrowserContext(
process->GetBrowserContext());
- if (profile->GetExtensionService()) {
- extensions::ProcessMap* process_map =
- profile->GetExtensionService()->process_map();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (extension_service) {
+ extensions::ProcessMap* process_map = extension_service->process_map();
if (process_map && process_map->Contains(process->GetID()))
command_line->AppendSwitch(switches::kExtensionProcess);
}
@@ -1359,7 +1368,8 @@
// extension has the 'notify' permission. (If the extension does not have the
// permission, the user will still be prompted.)
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
const Extension* extension = !service ? NULL :
service->extensions()->GetExtensionOrAppByURL(ExtensionURLInfo(
source_origin));
@@ -1649,7 +1659,8 @@
WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
chrome::ViewType view_type = chrome::GetViewType(web_contents);
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (service) {
const GURL& url = rvh->GetSiteInstance()->GetSiteURL();
const Extension* extension = service->extensions()->GetByID(url.host());
@@ -1788,8 +1799,10 @@
Profile* profile = Profile::FromBrowserContext(browser_context);
const Extension* extension = NULL;
- if (profile && profile->GetExtensionService()) {
- extension = profile->GetExtensionService()->extensions()->
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (extension_service) {
+ extension = extension_service->extensions()->
GetExtensionOrAppByURL(ExtensionURLInfo(url));
}
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc
index 2509ebd1..0c7fc086 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_util.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/file_reader.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -134,7 +135,7 @@
// Load/Unload ChromeVox
Profile* profile = ProfileManager::GetDefaultProfile();
ExtensionService* extension_service =
- profile->GetExtensionService();
+ extensions::ExtensionSystem::Get(profile)->extension_service();
FilePath path = FilePath(extension_misc::kChromeVoxExtensionPath);
if (enabled) { // Load ChromeVox
std::string extension_id =
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 564b13d..81c0587 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/process_map.h"
#include "chrome/browser/google_apis/drive_service_interface.h"
@@ -962,7 +963,8 @@
file_handler_util::FindDefaultTasks(profile_, file_urls,
common_tasks, &default_tasks);
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
for (std::set<const FileBrowserHandler*>::const_iterator iter =
common_tasks.begin();
iter != common_tasks.end();
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 26ee7cb..b31eb43 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -158,7 +158,8 @@
bool GetFileBrowserHandlers(Profile* profile,
const GURL& selected_file_url,
FileBrowserHandlerSet* results) {
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return false; // In unit-tests, we may not have an ExtensionService.
@@ -645,7 +646,8 @@
const Extension* FileTaskExecutor::GetExtension() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ExtensionService* service = profile()->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile())->extension_service();
return service ? service->GetExtensionById(extension_id_, false) :
NULL;
}
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 381966f..0063801 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/plugins/plugin_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -515,7 +516,8 @@
url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
}
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return;
@@ -767,7 +769,8 @@
GetFileBrowserExtensionUrl().GetOrigin(), &url))
return false;
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return false;
@@ -812,7 +815,8 @@
}
void InstallCRX(Browser* browser, const FilePath& path) {
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser->profile())->extension_service();
CHECK(service);
content::WebContents* web_contents =
diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc
index d85f52a6..a0567b49 100644
--- a/chrome/browser/chromeos/extensions/input_method_api.cc
+++ b/chrome/browser/chromeos/extensions/input_method_api.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/extensions/input_method_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
namespace extensions {
@@ -24,7 +25,8 @@
return false;
#else
chromeos::ExtensionInputMethodEventRouter* router =
- profile_->GetExtensionService()->input_method_event_router();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ input_method_event_router();
chromeos::input_method::InputMethodManager* manager =
chromeos::input_method::InputMethodManager::GetInstance();
const std::string input_method =
diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
index 30341f8..9ed92a70 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
@@ -7,6 +7,7 @@
#include "ash/shell.h"
#include "base/command_line.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
@@ -21,7 +22,8 @@
void OpenWallpaperManager() {
Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return;
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 0c83c01..2d6fe81d 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/webui_login_display_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/sandboxed_unpacker.h"
#include "chrome/browser/policy/app_pack_updater.h"
#include "chrome/browser/policy/browser_policy_connector.h"
@@ -179,8 +180,8 @@
Profile* default_profile = ProfileManager::GetDefaultProfile();
if (!default_profile)
return;
- FilePath extensions_dir =
- default_profile->GetExtensionService()->install_directory();
+ FilePath extensions_dir = extensions::ExtensionSystem::Get(default_profile)->
+ extension_service()->install_directory();
scoped_refptr<SandboxedUnpacker> screensaver_unpacker(
new SandboxedUnpacker(
screensaver_crx,
@@ -219,7 +220,8 @@
Profile* default_profile = ProfileManager::GetDefaultProfile();
// Add the extension to the extension service and display the screensaver.
if (default_profile) {
- default_profile->GetExtensionService()->AddExtension(extension);
+ extensions::ExtensionSystem::Get(default_profile)->extension_service()->
+ AddExtension(extension);
ash::ShowScreensaver(extension->GetFullLaunchURL());
} else {
LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";
diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc
index 3ae3897..beaaeadf 100644
--- a/chrome/browser/chromeos/login/help_app_launcher.cc
+++ b/chrome/browser/chromeos/login/help_app_launcher.cc
@@ -9,6 +9,7 @@
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "content/public/browser/browser_thread.h"
@@ -35,7 +36,8 @@
void HelpAppLauncher::ShowHelpTopic(HelpTopic help_topic_id) {
Profile* profile = ProfileManager::GetDefaultProfile();
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
DCHECK(service);
if (!service)
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 9094643..e55f30cd 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/login_wizard.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_switches.h"
@@ -107,7 +108,7 @@
EXPECT_EQ("Default", profile->GetPath().BaseName().value());
EXPECT_TRUE(profile->IsOffTheRecord());
// Ensure there's extension service for this profile.
- EXPECT_TRUE(profile->GetExtensionService());
+ EXPECT_TRUE(extensions::ExtensionSystem::Get(profile)->extension_service());
}
// Verifies the cursor is not hidden at startup when running guest session.
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index 36ca9703..e17d29e3 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/tab_contents/tab_util.h"
@@ -99,7 +100,8 @@
web_contents_->GetBrowserContext());
DCHECK(profile);
const extensions::Extension* extension = NULL;
- ExtensionService* extensions_service = profile->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
// Extension service does not exist in test.
if (extensions_service)
extension = extensions_service->extensions()->GetHostedAppByURL(
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc
index 7d4f12b..ce9b4d5 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc
@@ -195,7 +195,8 @@
private:
bool LoadExtensionFromPath(const FilePath& path) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
size_t num_before = service->extensions()->size();
{
content::NotificationRegistrar registrar;
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 6802c2c..528a805 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/debugger/devtools_window.h"
#include "chrome/browser/extensions/api/debugger/debugger_api.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/file_select_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -455,8 +456,8 @@
}
}
ListValue results;
- const ExtensionService* extension_service =
- tab_contents_->profile()->GetOriginalProfile()->GetExtensionService();
+ const ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ tab_contents_->profile()->GetOriginalProfile())->extension_service();
if (!extension_service)
return;
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 280bb10..0e07e96a 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/extensions/api/downloads/downloads_api.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_service_factory.h"
#include "chrome/browser/intents/web_intents_util.h"
@@ -410,7 +411,7 @@
const char kQuickOfficeExtensionId[] = "gbkeegbaiigmenfmjfclcdgdpimamgkj";
const char kQuickOfficeDevExtensionId[] = "ionpfmkccalenbmnddpbmocokhaknphg";
ExtensionServiceInterface* extension_service =
- profile_->GetExtensionService();
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
bool use_quickoffice = false;
if (extension_service &&
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 51e27dee..7a5cea4 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -30,6 +30,7 @@
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/history/download_row.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_service_factory.h"
@@ -1533,8 +1534,8 @@
EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
// Check that the CRX is not installed.
- ExtensionService* extension_service =
- browser()->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
}
@@ -1571,8 +1572,8 @@
EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
// Check that the extension was not installed.
- ExtensionService* extension_service =
- browser()->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
}
@@ -1608,8 +1609,8 @@
EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
// Check that the extension was installed.
- ExtensionService* extension_service =
- browser()->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_TRUE(extension_service->GetExtensionById(kGoodCrxId, false));
}
@@ -1634,8 +1635,8 @@
CheckDownloadStates(1, DownloadItem::COMPLETE);
// Check that the extension was not installed.
- ExtensionService* extension_service =
- browser()->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
}
@@ -1670,8 +1671,8 @@
EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
// Check that the extension was installed.
- ExtensionService* extension_service =
- browser()->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_TRUE(extension_service->GetExtensionById(kLargeThemeCrxId, false));
}
diff --git a/chrome/browser/download/download_crx_util.cc b/chrome/browser/download/download_crx_util.cc
index c8a0828..f7c71546 100644
--- a/chrome/browser/download/download_crx_util.cc
+++ b/chrome/browser/download/download_crx_util.cc
@@ -84,7 +84,8 @@
const DownloadItem& download_item) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+ extension_service();
CHECK(service);
scoped_refptr<extensions::CrxInstaller> installer(
diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
index 6320644..62947904 100644
--- a/chrome/browser/extensions/all_urls_apitest.cc
+++ b/chrome/browser/extensions/all_urls_apitest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/extension_apitest.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/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -29,7 +30,8 @@
extensions::Extension::SetScriptingWhitelist(whitelist);
// Then load extensions.
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
ASSERT_TRUE(LoadExtension(extension_dir1));
ASSERT_TRUE(LoadExtension(extension_dir2));
@@ -89,8 +91,8 @@
FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls")
.AppendASCII("execute_script");
-
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
ASSERT_TRUE(LoadExtension(extension_dir1));
ASSERT_TRUE(LoadExtension(extension_dir2));
diff --git a/chrome/browser/extensions/api/app/app_api.cc b/chrome/browser/extensions/api/app/app_api.cc
index 139ba6ab..3c0a5840 100644
--- a/chrome/browser/extensions/api/app/app_api.cc
+++ b/chrome/browser/extensions/api/app/app_api.cc
@@ -8,6 +8,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/app_notification_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/extension_constants.h"
#include "googleurl/src/gurl.h"
@@ -43,7 +44,8 @@
std::string id = extension_id();
if (details->HasKey(kExtensionIdKey)) {
EXTENSION_FUNCTION_VALIDATE(details->GetString(kExtensionIdKey, &id));
- if (!profile()->GetExtensionService()->GetExtensionById(id, true)) {
+ if (!extensions::ExtensionSystem::Get(profile())->extension_service()->
+ GetExtensionById(id, true)) {
error_ = kInvalidExtensionIdError;
return false;
}
@@ -78,8 +80,8 @@
item->set_link_text(link_text);
}
- AppNotificationManager* manager =
- profile()->GetExtensionService()->app_notification_manager();
+ AppNotificationManager* manager = extensions::ExtensionSystem::Get(
+ profile())->extension_service()->app_notification_manager();
// TODO(beaudoin) We should probably report an error if Add returns false.
manager->Add(item.release());
@@ -97,14 +99,15 @@
DictionaryValue* details = NULL;
if (args_->GetDictionary(0, &details) && details->HasKey(kExtensionIdKey)) {
EXTENSION_FUNCTION_VALIDATE(details->GetString(kExtensionIdKey, &id));
- if (!profile()->GetExtensionService()->GetExtensionById(id, true)) {
+ if (!extensions::ExtensionSystem::Get(profile())->extension_service()->
+ GetExtensionById(id, true)) {
error_ = kInvalidExtensionIdError;
return false;
}
}
- AppNotificationManager* manager =
- profile()->GetExtensionService()->app_notification_manager();
+ AppNotificationManager* manager = extensions::ExtensionSystem::Get(
+ profile())->extension_service()->app_notification_manager();
manager->ClearAll(id);
return true;
}
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index 9357bcc..87c17989 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/extensions/api/preference/preference_api_constants.h"
#include "chrome/browser/extensions/api/preference/preference_helpers.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/plugins/plugin_finder.h"
#include "chrome/browser/plugins/plugin_installer.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -88,8 +89,8 @@
}
}
- ContentSettingsStore* store =
- profile_->GetExtensionService()->GetContentSettingsStore();
+ ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->GetContentSettingsStore();
store->ClearContentSettingsForExtension(extension_id(), scope);
return true;
@@ -241,8 +242,8 @@
return false;
}
- ContentSettingsStore* store =
- profile_->GetExtensionService()->GetContentSettingsStore();
+ ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->GetContentSettingsStore();
store->SetExtensionContentSetting(extension_id(), primary_pattern,
secondary_pattern, content_type,
resource_identifier, setting, scope);
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index dba811a..81c1d54 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -122,7 +122,8 @@
ui_test_utils::NavigateToURL(browser(),
test_server()->GetURL("files/extensions/test_file.txt"));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -486,8 +487,8 @@
// Now enable the extension in incognito mode, and test that the browser
// action shows up. Note that we don't update the existing window at the
// moment, so we just create a new one.
- browser()->profile()->GetExtensionService()->extension_prefs()->
- SetIsIncognitoEnabled(extension->id(), true);
+ extensions::ExtensionSystem::Get(browser()->profile())->extension_service()->
+ extension_prefs()->SetIsIncognitoEnabled(extension->id(), true);
chrome::CloseWindow(incognito_browser);
incognito_browser = new Browser(Browser::CreateParams(incognito_profile));
@@ -499,7 +500,8 @@
}
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// The tooltips for each respective browser action.
const char kTooltipA[] = "Make this page red";
@@ -588,8 +590,8 @@
content::NotificationService::AllSources());
// Click the browser action.
- browser()->profile()->GetExtensionService()->toolbar_model()->
- ExecuteBrowserAction(extension, browser(), NULL);
+ extensions::ExtensionSystem::Get(browser()->profile())->extension_service()->
+ toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
// It can take a moment for the background page to actually get destroyed
// so we wait for the notification before checking that it's really gone
diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
index 601bfc6..e0e201db 100644
--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
@@ -56,7 +57,8 @@
ResultCatcher catcher;
int tab_id =
ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->browser_event_router()->PageActionExecuted(
browser()->profile(), *action, tab_id, "", 0);
EXPECT_TRUE(catcher.GetNextResult());
@@ -100,7 +102,8 @@
// install a page action popup.
{
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->browser_event_router()->PageActionExecuted(
browser()->profile(), *page_action, tab_id, "", 1);
ASSERT_TRUE(catcher.GetNextResult());
@@ -178,7 +181,8 @@
ResultCatcher catcher;
int tab_id =
ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ExtensionAction* page_action = GetPageAction(*extension);
service->browser_event_router()->PageActionExecuted(
browser()->profile(), *page_action, tab_id, "", 1);
diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
index 58e2ada0..7544b842 100644
--- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/extensions/extension_apitest.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_tab_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -60,8 +61,8 @@
ASSERT_FALSE(extension_action_manager()->GetPageAction(*extension));
// With the "action box" there won't be browser actions unless they're pinned.
- ExtensionPrefs* prefs =
- browser()->profile()->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->extension_prefs();
prefs->SetBrowserActionVisibility(extension, true);
// Test that there is a browser action in the toolbar.
@@ -86,7 +87,8 @@
{
// Simulate the page action being clicked.
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
EXPECT_TRUE(catcher.GetNextResult());
}
@@ -128,7 +130,8 @@
// install a page action popup.
{
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
ASSERT_TRUE(catcher.GetNextResult());
}
diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
index 6055cc0..ff11af4 100644
--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/location_bar_controller.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
@@ -77,7 +78,8 @@
{
// Simulate the script badge being clicked.
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->browser_event_router()->ScriptBadgeExecuted(
browser()->profile(), *script_badge, tab_id);
EXPECT_TRUE(catcher.GetNextResult());
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
index 5300405..d180248b 100644
--- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc
+++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
@@ -14,6 +14,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/api/preference/preference_helpers.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/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
@@ -226,7 +227,8 @@
EXTENSION_FUNCTION_VALIDATE(
profile_->GetPrefs()->FindPreference(pref_path.c_str()));
- ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->RemoveExtensionControlledPref(extension_id(),
pref_path.c_str(),
kExtensionPrefsScopeRegular);
@@ -283,7 +285,8 @@
EXTENSION_FUNCTION_VALIDATE(
profile_->GetPrefs()->FindPreference(pref_path.c_str()));
- ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->SetExtensionControlledPref(
extension_id(),
pref_path.c_str(),
@@ -340,7 +343,8 @@
return false;
}
- ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->RemoveExtensionControlledPref(extension_id(),
GetPrefName(),
kExtensionPrefsScopeRegular);
@@ -381,7 +385,8 @@
Value* value;
EXTENSION_FUNCTION_VALIDATE(details->Get(GetKey(), &value));
- ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->SetExtensionControlledPref(extension_id(),
GetPrefName(),
kExtensionPrefsScopeRegular,
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index 193c243..1f129f9 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -93,7 +93,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
UninstallWithConfirmDialog) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Install an extension.
const extensions::Extension* extension = InstallExtension(
@@ -180,7 +181,8 @@
pem_path,
FilePath());
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Install low-permission version of the extension.
ASSERT_TRUE(InstallExtension(path_v1, 1));
diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc
index aad5b186..053e542 100644
--- a/chrome/browser/extensions/api/management/management_apitest.cc
+++ b/chrome/browser/extensions/api/management/management_apitest.cc
@@ -117,7 +117,8 @@
// Tests actions on extensions when no management policy is in place.
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyAllowed) {
LoadExtensions();
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
false));
@@ -135,7 +136,8 @@
// Tests actions on extensions when management policy prohibits those actions.
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyProhibited) {
LoadExtensions();
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
false));
@@ -151,7 +153,8 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Load an extension that calls launchApp() on any app that gets
// installed.
@@ -206,7 +209,8 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchTabApp) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Load an extension that calls launchApp() on any app that gets
// installed.
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index 1b9f9e3..f91dbe8 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -123,7 +123,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) {
// Installing the extension without an auto confirming UI should result in
// it being disabled, since good.crx has permissions that require approval.
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
std::string id = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
ASSERT_FALSE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 0));
ASSERT_TRUE(service->GetExtensionById(id, true));
@@ -139,7 +140,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) {
ExtensionProcessManager* manager =
extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
// Load an extension, expect the background page to be available.
@@ -259,7 +261,8 @@
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
ASSERT_TRUE(service->disabled_extensions()->is_empty());
const Extension* extension =
@@ -343,7 +346,8 @@
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t enabled_size_before = service->extensions()->size();
const size_t disabled_size_before = service->disabled_extensions()->size();
const Extension* extension =
@@ -390,7 +394,8 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
// We don't want autoupdate blacklist checks.
extensions::ExtensionUpdater::CheckParams params;
@@ -475,7 +480,8 @@
// See http://crbug.com/57378 for flakiness details.
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
// We don't want autoupdate blacklist checks.
extensions::ExtensionUpdater::CheckParams params;
@@ -552,7 +558,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
MAYBE_PolicyOverridesUserInstall) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
extensions::ExtensionUpdater::CheckParams params;
params.check_blacklist = false;
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 08c996c..fc480977 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_prefs_scope.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/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
@@ -275,7 +276,8 @@
const PrefServiceBase::Preference* pref =
pref_service->FindPreference(browser_pref.c_str());
CHECK(pref);
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
PrefTransformerInterface* transformer =
PrefMapping::GetInstance()->FindTransformerForBrowserPref(browser_pref);
Value* transformed_value =
@@ -372,7 +374,8 @@
// Retrieve incognito status.
if (incognito) {
extensions::ExtensionPrefs* ep =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
result->SetBoolean(keys::kIncognitoSpecific,
ep->HasIncognitoPrefValue(browser_pref));
}
@@ -432,7 +435,8 @@
if (!ValidateBrowserPref(pref_key, &browser_pref))
return false;
extensions::ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
const PrefService::Preference* pref =
prefs->pref_service()->FindPreference(browser_pref.c_str());
CHECK(pref);
@@ -508,7 +512,8 @@
return false;
extensions::ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
return true;
}
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 38a0679..5bb6358e 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
#include "chrome/browser/tab_contents/render_view_context_menu.h"
@@ -485,7 +486,8 @@
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
GURL url = extension->GetResourceURL("userAction/a.html");
@@ -518,7 +520,8 @@
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
GURL url = extension->GetResourceURL("requestOpenTab/a.html");
@@ -610,7 +613,8 @@
LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app"));
LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
@@ -629,7 +633,8 @@
IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) {
LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
@@ -659,7 +664,8 @@
IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) {
LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 666aa0e..2bec005 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
#include "chrome/browser/extensions/extension_apitest.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/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -118,7 +119,8 @@
ResultCatcher catcher;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
GURL url = extension->GetResourceURL("newTab/a.html");
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index e9fa6b93..d166c89 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/extensions/extension_function_dispatcher.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/webstore_installer.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -472,7 +473,8 @@
}
bool GetStoreLoginFunction::RunImpl() {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
ExtensionPrefs* prefs = service->extension_prefs();
std::string login;
if (prefs->GetWebStoreLogin(&login)) {
@@ -486,7 +488,8 @@
bool SetStoreLoginFunction::RunImpl() {
std::string login;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &login));
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
ExtensionPrefs* prefs = service->extension_prefs();
prefs->SetWebStoreLogin(login);
return true;
diff --git a/chrome/browser/extensions/app_notification_browsertest.cc b/chrome/browser/extensions/app_notification_browsertest.cc
index 47bcd9bd..b98e5d28 100644
--- a/chrome/browser/extensions/app_notification_browsertest.cc
+++ b/chrome/browser/extensions/app_notification_browsertest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/extensions/app_notify_channel_setup.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/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/extensions/application_launch.h"
@@ -68,7 +69,8 @@
content::RunMessageLoop();
EXPECT_TRUE(interceptor.was_called());
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ExtensionPrefs* prefs = service->extension_prefs();
std::string saved_id = prefs->GetAppNotificationClientId(app->id());
EXPECT_EQ(kExpectedClientId, saved_id);
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 3161bd93..d6a68aa 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/process_map.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
@@ -63,8 +64,8 @@
void TestAppInstancesHelper(std::string app_name) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -134,8 +135,8 @@
IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -249,7 +250,8 @@
// Tests that bookmark apps do not use the app process model and are treated
// like normal web pages instead. http://crbug.com/104636.
IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
extensions::ProcessMap* process_map = service->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
@@ -368,8 +370,8 @@
#define MAYBE_ReloadIntoAppProcess ReloadIntoAppProcess
#endif
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -451,8 +453,8 @@
// empty.html) results in the new window being in an app process. See
// http://crbug.com/89272 for more details.
IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -562,8 +564,8 @@
// missing special permissions and should be scriptable from the iframe.
// See http://crbug.com/92669 for more details.
IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -600,8 +602,8 @@
#define MAYBE_ReloadAppAfterCrash ReloadAppAfterCrash
#endif
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index a476f51..f0c7582 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/ui/browser_tabstrip.h"
// Tests that tooltips of a browser action icon can be specified using UTF8.
// See http://crbug.com/25349.
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
.AppendASCII("title_localized"));
diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc
index 67ca6d0..79bc3947 100644
--- a/chrome/browser/extensions/context_menu_matcher.cc
+++ b/chrome/browser/extensions/context_menu_matcher.cc
@@ -6,6 +6,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/extensions/context_menu_matcher.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/common/context_menu_params.h"
#include "ui/gfx/favicon_size.h"
@@ -28,7 +29,8 @@
const string16& selection_text,
int* index)
{
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
MenuManager* manager = service->menu_manager();
const Extension* extension = service->GetExtensionById(extension_id, false);
DCHECK_GE(*index, 0);
@@ -115,7 +117,8 @@
void ContextMenuMatcher::ExecuteCommand(int command_id,
content::WebContents* web_contents,
const content::ContextMenuParams& params) {
- MenuManager* manager = profile_->GetExtensionService()->menu_manager();
+ MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->menu_manager();
MenuItem* item = GetExtensionMenuItem(command_id);
if (!item)
return;
@@ -204,7 +207,8 @@
}
MenuItem* ContextMenuMatcher::GetExtensionMenuItem(int id) const {
- MenuManager* manager = profile_->GetExtensionService()->menu_manager();
+ MenuManager* manager = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->menu_manager();
std::map<int, MenuItem::Id>::const_iterator i =
extension_item_map_.find(id);
if (i != extension_item_map_.end()) {
@@ -216,7 +220,8 @@
}
void ContextMenuMatcher::SetExtensionIcon(const std::string& extension_id) {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
MenuManager* menu_manager = service->menu_manager();
int index = menu_model_->GetItemCount() - 1;
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index f8a9bb77..fef8f7c 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
@@ -82,7 +83,8 @@
const std::string& ext_relpath,
const std::string& id,
MockInstallPrompt* mock_install_prompt) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
FilePath ext_path = test_data_dir_.AppendASCII(ext_relpath);
std::string error;
@@ -119,7 +121,8 @@
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
MockInstallPrompt* mock_prompt =
CreateMockInstallPromptForBrowser(browser());
@@ -142,7 +145,8 @@
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, MAYBE_Whitelisting) {
std::string id = "hdgllgikmikobbofgnabhfimcfoopgnd";
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Even whitelisted extensions with NPAPI should not prompt.
MockInstallPrompt* mock_prompt =
@@ -247,7 +251,8 @@
#endif
// Crashy: http://crbug.com/140893
IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, DISABLED_AllowOffStore) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const bool kTestData[] = {false, true};
for (size_t i = 0; i < arraysize(kTestData); ++i) {
diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc
index 3fe9f16..76aa015 100644
--- a/chrome/browser/extensions/event_router.cc
+++ b/chrome/browser/extensions/event_router.cc
@@ -236,8 +236,8 @@
bool is_new = listeners_.AddListener(listener.Pass());
if (is_new) {
- ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
std::set<std::string> events = prefs->GetRegisteredEvents(extension_id);
bool prefs_is_new = events.insert(event_name).second;
if (prefs_is_new)
@@ -252,8 +252,8 @@
bool did_exist = listeners_.RemoveListener(&listener);
if (did_exist) {
- ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
std::set<std::string> events = prefs->GetRegisteredEvents(extension_id);
bool prefs_did_exist = events.erase(event_name) > 0;
DCHECK(prefs_did_exist);
@@ -276,8 +276,8 @@
scoped_ptr<DictionaryValue>(filter.DeepCopy()))));
if (added) {
- ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->AddFilterToEvent(event_name, extension_id, &filter);
}
}
@@ -299,8 +299,8 @@
bool removed = listeners_.RemoveListener(&listener);
if (removed) {
- ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
prefs->RemoveFilterFromEvent(event_name, extension_id, &filter);
}
}
@@ -454,7 +454,8 @@
const std::string& extension_id,
const linked_ptr<Event>& event,
std::set<EventDispatchIdentifier>* already_dispatched) {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
// Check both the original and the incognito profile to see if we
// should load a lazy bg page to handle the event. The latter case
// occurs in the case of split-mode extensions.
@@ -479,7 +480,8 @@
void EventRouter::DispatchEventToProcess(const std::string& extension_id,
content::RenderProcessHost* process,
const linked_ptr<Event>& event) {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = service->extensions()->GetByID(extension_id);
// The extension could have been removed, but we do not unregister it until
@@ -489,8 +491,8 @@
Profile* listener_profile = Profile::FromBrowserContext(
process->GetBrowserContext());
- ProcessMap* process_map =
- listener_profile->GetExtensionService()->process_map();
+ ProcessMap* process_map = extensions::ExtensionSystem::Get(listener_profile)->
+ extension_service()->process_map();
// If the event is privileged, only send to extension processes. Otherwise,
// it's OK to send to normal renderers (e.g., for content scripts).
if (ExtensionAPI::GetSharedInstance()->IsPrivileged(event->event_name) &&
@@ -523,7 +525,8 @@
bool cross_incognito =
event->restrict_to_profile && profile != event->restrict_to_profile;
if (cross_incognito &&
- !profile->GetExtensionService()->CanCrossIncognito(extension)) {
+ !extensions::ExtensionSystem::Get(profile)->extension_service()->
+ CanCrossIncognito(extension)) {
if (!event->cross_incognito_args.get())
return false;
// Send the event with different arguments to extensions that can't
@@ -626,8 +629,8 @@
// Add all registered lazy listeners to our cache.
const Extension* extension =
content::Details<const Extension>(details).ptr();
- ExtensionPrefs* prefs =
- profile_->GetExtensionService()->extension_prefs();
+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->extension_prefs();
std::set<std::string> registered_events =
prefs->GetRegisteredEvents(extension->id());
listeners_.LoadUnfilteredLazyListeners(extension->id(),
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index f70b3b1..9ab6a72 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -6,8 +6,9 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/api/test/test_api.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -251,7 +252,8 @@
// Test that exactly one extension is loaded, and return it.
const extensions::Extension* ExtensionApiTest::GetSingleLoadedExtension() {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension = NULL;
for (ExtensionSet::const_iterator it = service->extensions()->begin();
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 04e95f1..0933e74 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -79,7 +79,8 @@
const Extension* ExtensionBrowserTest::LoadExtensionWithFlags(
const FilePath& path, int flags) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
{
content::NotificationRegistrar registrar;
registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
@@ -184,7 +185,8 @@
const Extension* ExtensionBrowserTest::LoadExtensionAsComponent(
const FilePath& path) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
std::string manifest;
if (!file_util::ReadFileToString(path.Append(Extension::kManifestFilename),
@@ -405,7 +407,8 @@
}
void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->ReloadExtension(extension_id);
ui_test_utils::RegisterAndWait(this,
chrome::NOTIFICATION_EXTENSION_LOADED,
@@ -413,22 +416,26 @@
}
void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->UnloadExtension(extension_id, extension_misc::UNLOAD_REASON_DISABLE);
}
void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->UninstallExtension(extension_id, false, NULL);
}
void ExtensionBrowserTest::DisableExtension(const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
}
void ExtensionBrowserTest::EnableExtension(const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->EnableExtension(extension_id);
}
@@ -515,7 +522,8 @@
bool ExtensionBrowserTest::WaitForExtensionCrash(
const std::string& extension_id) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
if (!service->GetExtensionById(extension_id, true)) {
// The extension is already unloaded, presumably due to a crash.
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index b2a44bd..ce6b6e8 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -113,7 +113,8 @@
OpenOptionsPage(extension, browser_);
break;
case HIDE: {
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
extension_service->extension_prefs()->
SetBrowserActionVisibility(extension, false);
break;
@@ -140,10 +141,10 @@
}
void ExtensionContextMenuModel::ExtensionUninstallAccepted() {
- if (GetExtension())
- profile_->GetExtensionService()->UninstallExtension(extension_id_, false,
- NULL);
-
+ if (GetExtension()) {
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ UninstallExtension(extension_id_, false, NULL);
+ }
Release();
}
@@ -178,6 +179,7 @@
}
const Extension* ExtensionContextMenuModel::GetExtension() const {
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
return extension_service->GetExtensionById(extension_id_, false);
}
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 8218593..f46e888 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -230,7 +230,8 @@
LoadInitialURL();
if (is_background_page()) {
DCHECK(IsRenderViewLive());
- profile_->GetExtensionService()->DidCreateRenderViewForBackgroundPage(this);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ DidCreateRenderViewForBackgroundPage(this);
}
}
@@ -246,7 +247,8 @@
void ExtensionHost::LoadInitialURL() {
if (!is_background_page() &&
- !profile_->GetExtensionService()->IsBackgroundPageReady(extension_)) {
+ !extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsBackgroundPageReady(extension_)) {
// Make sure the background page loads before any others.
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
content::Source<Extension>(extension_));
@@ -270,7 +272,7 @@
const content::NotificationDetails& details) {
switch (type) {
case chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY:
- DCHECK(profile_->GetExtensionService()->
+ DCHECK(extensions::ExtensionSystem::Get(profile_)->extension_service()->
IsBackgroundPageReady(extension_));
LoadInitialURL();
break;
@@ -388,7 +390,8 @@
document_element_available_ = true;
if (is_background_page()) {
- profile_->GetExtensionService()->SetBackgroundPageReady(extension_);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ SetBackgroundPageReady(extension_);
} else {
switch (extension_host_type_) {
case chrome::VIEW_TYPE_EXTENSION_INFOBAR:
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index 7130770..cad8da7f 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -34,7 +34,8 @@
}
void ExtensionKeybindingRegistry::Init() {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!service)
return; // ExtensionService can be null during testing.
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index 168b9e97..3e910ac 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/crx_installer.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/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -46,7 +47,8 @@
const Extension* InstallExtension(InstallType install_type) {
FilePath file_path = test_data_dir_.AppendASCII("native_client");
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const Extension* extension = NULL;
switch (install_type) {
case INSTALL_TYPE_COMPONENT:
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 9cad8fb..52b4680 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -91,7 +91,8 @@
void WaitForServicesToStart(int num_expected_extensions,
bool expect_extensions_enabled) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
// Count the number of non-component extensions.
int found_extensions = 0;
@@ -186,7 +187,8 @@
// doing so reloads them.
std::vector<const extensions::Extension*> extension_list;
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
for (ExtensionSet::const_iterator it = service->extensions()->begin();
it != service->extensions()->end(); ++it) {
if ((*it)->location() == extensions::Extension::COMPONENT)
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index ddf0f6e..f38a4c7 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -28,7 +29,8 @@
}
virtual void SetUpOnMainThread() OVERRIDE {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
model_ = service->toolbar_model();
model_->AddObserver(this);
}
diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc
index 449bede..1853654 100644
--- a/chrome/browser/extensions/navigation_observer.cc
+++ b/chrome/browser/extensions/navigation_observer.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/extensions/extension_install_ui.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
@@ -55,7 +56,8 @@
if (!nav_entry)
return;
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = extension_service->disabled_extensions()->
GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL()));
if (!extension)
@@ -80,7 +82,8 @@
}
void NavigationObserver::InstallUIProceed() {
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = extension_service->GetExtensionById(
in_progress_prompt_extension_id_, true);
NavigationController* nav_controller =
@@ -100,7 +103,8 @@
}
void NavigationObserver::InstallUIAbort(bool user_initiated) {
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = extension_service->GetExtensionById(
in_progress_prompt_extension_id_, true);
diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc
index d5c9a04..50536e17 100644
--- a/chrome/browser/extensions/options_page_apitest.cc
+++ b/chrome/browser/extensions/options_page_apitest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -33,7 +34,8 @@
const Extension* extension =
InstallExtension(test_data_dir_.AppendASCII("options.crx"), 1);
ASSERT_TRUE(extension);
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
ASSERT_EQ(1u, service->extensions()->size());
// Go to the Extension Settings page and click the Options button.
diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc
index a7b1bfc..d40a2a5 100644
--- a/chrome/browser/extensions/page_action_browsertest.cc
+++ b/chrome/browser/extensions/page_action_browsertest.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/extensions/extension_action_manager.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/extensions/extension_tab_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h"
@@ -116,7 +117,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) {
base::TimeTicks start_time = base::TimeTicks::Now();
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
size_t size_before = service->extensions()->size();
@@ -171,7 +173,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) {
ASSERT_TRUE(test_server()->Start());
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const size_t size_before = service->extensions()->size();
FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc
index 2c6717a9..57c50854 100644
--- a/chrome/browser/extensions/permissions_updater.cc
+++ b/chrome/browser/extensions/permissions_updater.cc
@@ -226,7 +226,8 @@
}
ExtensionPrefs* PermissionsUpdater::GetExtensionPrefs() {
- return profile_->GetExtensionService()->extension_prefs();
+ return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
}
} // namespace extensions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index 136f7e8..d776bc21 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 @@
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 @@
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);
diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc
index a5f5a252..eb663337 100644
--- a/chrome/browser/extensions/process_management_browsertest.cc
+++ b/chrome/browser/extensions/process_management_browsertest.cc
@@ -229,6 +229,9 @@
// We've loaded 5 extensions with background pages, 1 extension without
// background page, and one isolated app. We expect only 2 unique processes
// hosting those extensions.
- EXPECT_GE((size_t) 6, profile->GetExtensionService()->process_map()->size());
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+
+ EXPECT_GE((size_t) 6, service->process_map()->size());
EXPECT_EQ((size_t) 2, process_ids.size());
}
diff --git a/chrome/browser/extensions/settings/settings_frontend.cc b/chrome/browser/extensions/settings/settings_frontend.cc
index 7f5394b..1d26b26 100644
--- a/chrome/browser/extensions/settings/settings_frontend.cc
+++ b/chrome/browser/extensions/settings/settings_frontend.cc
@@ -172,7 +172,8 @@
// TODO(kalman): change RunWithStorage() to take a
// scoped_refptr<const Extension> instead.
scoped_refptr<const Extension> extension =
- profile_->GetExtensionService()->GetExtensionById(extension_id, true);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(extension_id, true);
CHECK(extension);
cache->GetMessageLoop()->PostTask(
diff --git a/chrome/browser/extensions/settings/settings_frontend_unittest.cc b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
index 73ee6a1..34e23180 100644
--- a/chrome/browser/extensions/settings/settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
@@ -94,8 +94,10 @@
TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -125,8 +127,10 @@
TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_LEGACY_PACKAGED_APP);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_LEGACY_PACKAGED_APP);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -151,8 +155,10 @@
TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -187,8 +193,10 @@
TEST_F(ExtensionSettingsFrontendTest,
QuotaLimitsEnforcedCorrectlyForSyncAndLocal) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* sync_storage =
util::GetStorage(id, settings::SYNC, frontend_.get());
@@ -264,8 +272,11 @@
const std::string id = "ext";
std::set<std::string> permissions;
permissions.insert("unlimitedStorage");
- profile_->GetMockExtensionService()->AddExtensionWithIdAndPermissions(
- id, Extension::TYPE_EXTENSION, permissions);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithIdAndPermissions(id, Extension::TYPE_EXTENSION,
+ permissions);
frontend_->RunWithStorage(
id, settings::SYNC, base::Bind(&UnlimitedSyncStorageTestCallback));
diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc
index 49f3d6b..1386244d 100644
--- a/chrome/browser/extensions/settings/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc
@@ -10,12 +10,14 @@
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h"
#include "chrome/browser/extensions/settings/settings_frontend.h"
#include "chrome/browser/extensions/settings/settings_storage_factory.h"
#include "chrome/browser/extensions/settings/settings_sync_util.h"
#include "chrome/browser/extensions/settings/settings_test_util.h"
#include "chrome/browser/extensions/settings/syncable_settings_storage.h"
+#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/value_store/testing_value_store.h"
#include "content/public/test/test_browser_thread.h"
#include "sync/api/sync_change_processor.h"
@@ -225,7 +227,10 @@
// its storage area.
ValueStore* AddExtensionAndGetStorage(
const std::string& id, Extension::Type type) {
- profile_->GetMockExtensionService()->AddExtensionWithId(id, type);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, type);
return util::GetStorage(id, frontend_.get());
}
diff --git a/chrome/browser/extensions/settings/settings_test_util.cc b/chrome/browser/extensions/settings/settings_test_util.cc
index afb1ca0e..7f928505 100644
--- a/chrome/browser/extensions/settings/settings_test_util.cc
+++ b/chrome/browser/extensions/settings/settings_test_util.cc
@@ -118,6 +118,12 @@
return event_router_.get();
}
+ExtensionService* MockExtensionSystem::extension_service() {
+ ExtensionServiceInterface* as_interface =
+ static_cast<ExtensionServiceInterface*>(&extension_service_);
+ return static_cast<ExtensionService*>(as_interface);
+}
+
ProfileKeyedService* BuildMockExtensionSystem(Profile* profile) {
return new MockExtensionSystem(profile);
}
@@ -132,16 +138,6 @@
MockProfile::~MockProfile() {}
-MockExtensionService* MockProfile::GetMockExtensionService() {
- return &extension_service_;
-}
-
-ExtensionService* MockProfile::GetExtensionService() {
- ExtensionServiceInterface* as_interface =
- static_cast<ExtensionServiceInterface*>(&extension_service_);
- return static_cast<ExtensionService*>(as_interface);
-}
-
// ScopedSettingsFactory
ScopedSettingsStorageFactory::ScopedSettingsStorageFactory() {}
diff --git a/chrome/browser/extensions/settings/settings_test_util.h b/chrome/browser/extensions/settings/settings_test_util.h
index 7a1e8e47..d1f3e44 100644
--- a/chrome/browser/extensions/settings/settings_test_util.h
+++ b/chrome/browser/extensions/settings/settings_test_util.h
@@ -71,9 +71,11 @@
virtual ~MockExtensionSystem();
virtual EventRouter* event_router() OVERRIDE;
+ virtual ExtensionService* extension_service() OVERRIDE;
private:
scoped_ptr<EventRouter> event_router_;
+ MockExtensionService extension_service_;
DISALLOW_COPY_AND_ASSIGN(MockExtensionSystem);
};
@@ -84,14 +86,6 @@
public:
explicit MockProfile(const FilePath& file_path);
virtual ~MockProfile();
-
- // Returns the same object as GetExtensionService, but not coaxed into an
- // ExtensionService; use this method from tests.
- MockExtensionService* GetMockExtensionService();
- virtual ExtensionService* GetExtensionService() OVERRIDE;
-
- private:
- MockExtensionService extension_service_;
};
// SettingsStorageFactory which acts as a wrapper for other factories.
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index cc21440c..5f0988c0 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -17,6 +17,7 @@
#include "base/threading/thread.h"
#include "base/version.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h"
@@ -359,8 +360,8 @@
extensions_info_[extension->id()] =
ExtensionSet::ExtensionPathAndDefaultLocale(
extension->path(), extension->default_locale());
- bool incognito_enabled = profile_->GetExtensionService()->
- IsIncognitoEnabled(extension->id());
+ bool incognito_enabled = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->IsIncognitoEnabled(extension->id());
const UserScriptList& scripts = extension->content_scripts();
for (UserScriptList::const_iterator iter = scripts.begin();
iter != scripts.end(); ++iter) {
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 7bb0e77..da079f9 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
#include "chrome/browser/geolocation/geolocation_permission_request_id.h"
#include "chrome/browser/profiles/profile.h"
@@ -55,7 +56,8 @@
tab_util::GetWebContentsByID(render_process_id, render_view_id);
const GeolocationPermissionRequestID id(render_process_id, render_view_id,
bridge_id);
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (extension_service) {
const extensions::Extension* extension =
extension_service->extensions()->GetExtensionOrAppByURL(
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index f2e3b17d..933cd64 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/content_settings/content_settings_provider.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/notifications/desktop_notification_service_factory.h"
#include "chrome/browser/notifications/notification.h"
@@ -476,7 +477,8 @@
const GURL& origin) {
// If the source is an extension, lookup the display name.
if (origin.SchemeIs(extensions::kExtensionScheme)) {
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (extension_service) {
const extensions::Extension* extension =
extension_service->extensions()->GetExtensionOrAppByURL(
diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
index 32db30b..d89d059 100644
--- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
+++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc
@@ -87,8 +87,8 @@
ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
process->GetID(), chrome::kChromeUIScheme);
- if (profile_->GetExtensionService()->extension_prefs()->AllowFileAccess(
- extension->id())) {
+ if (extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs()->AllowFileAccess(extension->id())) {
ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
process->GetID(), chrome::kFileScheme);
}
@@ -126,7 +126,8 @@
if (!site.SchemeIs(extensions::kExtensionScheme))
return NULL;
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!service)
return NULL;
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index c2d256f..dacbf30 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -18,6 +18,7 @@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/history/history_notifications.h"
@@ -1622,7 +1623,8 @@
for (PendingExtensionIDs::const_iterator i(pending_extension_ids_.begin());
i != pending_extension_ids_.end(); ++i) {
const extensions::Extension* extension =
- profile_->GetExtensionService()->GetExtensionById(*i, true);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(*i, true);
if (extension)
RegisterExtensionKeyword(extension);
}
diff --git a/chrome/browser/speech/speech_input_extension_manager.cc b/chrome/browser/speech/speech_input_extension_manager.cc
index 476698d..75ee6928 100644
--- a/chrome/browser/speech/speech_input_extension_manager.cc
+++ b/chrome/browser/speech/speech_input_extension_manager.cc
@@ -525,8 +525,9 @@
NOTREACHED();
}
- const extensions::Extension* extension = profile_->GetExtensionService()->
- GetExtensionById(extension_id, true);
+ const extensions::Extension* extension =
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(extension_id, true);
DCHECK(extension);
const std::string& extension_name = extension->name();
diff --git a/chrome/browser/sync/glue/app_notification_data_type_controller.cc b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
index 6b6d01e..1fef9087 100644
--- a/chrome/browser/sync/glue/app_notification_data_type_controller.cc
+++ b/chrome/browser/sync/glue/app_notification_data_type_controller.cc
@@ -7,6 +7,7 @@
#include "base/metrics/histogram.h"
#include "chrome/browser/extensions/app_notification_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/glue/generic_change_processor.h"
#include "chrome/browser/sync/profile_sync_components_factory.h"
@@ -44,7 +45,8 @@
extensions::AppNotificationManager*
AppNotificationDataTypeController::GetAppNotificationManager() {
- return profile_->GetExtensionService()->app_notification_manager();
+ return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ app_notification_manager();
}
// We want to start the extensions::AppNotificationManager before we begin
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index ea5e634..c5a19cc 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -357,7 +357,8 @@
void RenderViewContextMenu::AppendAllExtensionItems() {
extension_items_.Clear();
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!service)
return; // In unit-tests, we may not have an ExtensionService.
MenuManager* menu_manager = service->menu_manager();
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 980023e..271f4545d 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/browser_process.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/infobars/infobar_tab_helper.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
#include "chrome/browser/notifications/notification.h"
@@ -378,7 +379,8 @@
int resource_count = TaskManager::GetInstance()->model()->ResourceCount();
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("packaged_app")));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const extensions::Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 232c2cd..4924c9c 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -393,7 +393,8 @@
// static
void ThemeService::RemoveUnusedThemesForProfile(Profile* profile) {
- ExtensionService* extension_service = profile->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!extension_service)
return;
std::string current_theme = GetThemeIDForProfile(profile);
@@ -627,7 +628,8 @@
} else {
// TODO(erg): We need to pop up a dialog informing the user that their
// theme is being migrated.
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (service) {
const Extension* extension =
service->GetExtensionById(current_id, false);
diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc
index 5b969d2..56fc5ffc 100644
--- a/chrome/browser/themes/theme_syncable_service.cc
+++ b/chrome/browser/themes/theme_syncable_service.cc
@@ -6,6 +6,7 @@
#include "base/stringprintf.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/theme_service.h"
#include "chrome/common/extensions/extension.h"
@@ -196,7 +197,7 @@
GURL update_url(theme_specifics.custom_theme_update_url());
DVLOG(1) << "Applying theme " << id << " with update_url " << update_url;
ExtensionServiceInterface* extensions_service =
- profile_->GetExtensionService();
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
CHECK(extensions_service);
const extensions::Extension* extension =
extensions_service->GetExtensionById(id, true);
@@ -238,8 +239,8 @@
const extensions::Extension* current_theme =
theme_service_->UsingDefaultTheme() ?
NULL :
- profile_->GetExtensionService()->GetExtensionById(
- theme_service_->GetThemeID(), false);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(theme_service_->GetThemeID(), false);
bool use_custom_theme = (current_theme != NULL);
theme_specifics->set_use_custom_theme(use_custom_theme);
if (IsSystemThemeDistinctFromDefaultTheme()) {
diff --git a/chrome/browser/ui/app_list/apps_model_builder.cc b/chrome/browser/ui/app_list/apps_model_builder.cc
index 8694caa..b2416ad 100644
--- a/chrome/browser/ui/app_list/apps_model_builder.cc
+++ b/chrome/browser/ui/app_list/apps_model_builder.cc
@@ -10,6 +10,7 @@
#include "base/auto_reset.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/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/extension_app_item.h"
@@ -45,7 +46,8 @@
model_(model),
ignore_changes_(false) {
extensions::ExtensionPrefs* extension_prefs =
- profile_->GetExtensionService()->extension_prefs();
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ extension_prefs();
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
content::Source<Profile>(profile_));
@@ -76,7 +78,8 @@
}
void AppsModelBuilder::PopulateApps() {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!service)
return;
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index d0999e7e..dfa0fa98 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -65,7 +65,8 @@
void Run() {
const Extension* extension =
- profile_->GetExtensionService()->GetExtensionById(extension_id_, true);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetExtensionById(extension_id_, true);
if (!extension) {
CleanUp();
return;
@@ -78,7 +79,8 @@
private:
// Overridden from ExtensionUninstallDialog::Delegate:
virtual void ExtensionUninstallAccepted() OVERRIDE {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
const Extension* extension = service->GetExtensionById(extension_id_, true);
if (extension) {
service->UninstallExtension(extension_id_,
@@ -109,26 +111,29 @@
extensions::ExtensionPrefs::LaunchType GetExtensionLaunchType(
Profile* profile,
const Extension* extension) {
- return profile->GetExtensionService()->extension_prefs()->GetLaunchType(
- extension, extensions::ExtensionPrefs::LAUNCH_DEFAULT);
+ return extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->GetLaunchType(extension,
+ extensions::ExtensionPrefs::LAUNCH_DEFAULT);
}
void SetExtensionLaunchType(
Profile* profile,
const std::string& extension_id,
extensions::ExtensionPrefs::LaunchType launch_type) {
- profile->GetExtensionService()->extension_prefs()->SetLaunchType(
- extension_id, launch_type);
+ extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->SetLaunchType(extension_id, launch_type);
}
bool IsExtensionEnabled(Profile* profile, const std::string& extension_id) {
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
return service->IsExtensionEnabled(extension_id) &&
!service->GetTerminatedExtension(extension_id);
}
ExtensionSorting* GetExtensionSorting(Profile* profile) {
- return profile->GetExtensionService()->extension_prefs()->extension_sorting();
+ return extensions::ExtensionSystem::Get(profile)->extension_service()->
+ extension_prefs()->extension_sorting();
}
bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
@@ -152,8 +157,8 @@
}
const Extension* ExtensionAppItem::GetExtension() const {
- const Extension* extension =
- profile_->GetExtensionService()->GetInstalledExtension(extension_id_);
+ const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->GetInstalledExtension(extension_id_);
return extension;
}
@@ -171,7 +176,8 @@
if (!prev && !next)
return;
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
service->extension_prefs()->SetAppDraggedByUser(extension_id_);
// Handles only predecessor or only successor case.
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc
index 25457f3a..25e44d7 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state.cc
+++ b/chrome/browser/ui/ash/app_sync_ui_state.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/ash/app_sync_ui_state.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -122,8 +123,9 @@
return;
const bool synced = sync_service_->ShouldPushChanges();
- const bool has_pending_extension = profile_->GetExtensionService()->
- pending_extension_manager()->HasPendingExtensionFromSync();
+ const bool has_pending_extension =
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ pending_extension_manager()->HasPendingExtensionFromSync();
if (synced && !has_pending_extension)
SetStatus(STATUS_NORMAL);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index 0c60aa1..a9b8d26 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_function_test_utils.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/browser/extensions/shell_window_registry.h"
@@ -84,7 +85,8 @@
WindowOpenDisposition disposition) {
EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII(name)));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
const Extension* extension =
service->GetExtensionById(last_loaded_extension_id_, false);
EXPECT_TRUE(extension);
@@ -95,7 +97,8 @@
}
ash::LauncherID CreateShortcut(const char* name) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
LoadExtension(test_data_dir_.AppendASCII(name));
// First get app_id.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ba5f4b5..2555e198 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -53,6 +53,7 @@
#include "chrome/browser/extensions/browser_extension_window_controller.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/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/file_select_helper.h"
@@ -1703,7 +1704,8 @@
if (web_contents &&
!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kWebIntentsInvocationEnabled)) {
- ExtensionService* extensions_service = profile_->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!extensions_service ||
extensions_service->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(web_contents->GetURL())) == NULL) {
@@ -2344,7 +2346,8 @@
const string16& frame_name,
const GURL& target_url) {
GURL opener_url = opener_web_contents->GetURL();
- ExtensionService* extensions_service = profile_->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!opener_url.is_valid() ||
frame_name.empty() ||
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 5283ceb..fe91f07 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/defaults.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/extensions/tab_helper.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -210,8 +211,8 @@
// Returns the app extension aptly named "App Test".
const Extension* GetExtension() {
- const ExtensionSet* extensions =
- browser()->profile()->GetExtensionService()->extensions();
+ const ExtensionSet* extensions = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->extensions();
for (ExtensionSet::const_iterator it = extensions->begin();
it != extensions->end(); ++it) {
if ((*it)->name() == "App Test")
@@ -886,7 +887,8 @@
model->AddObserver(&observer);
// Uninstall the extension and make sure TabClosing is sent.
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->UninstallExtension(GetExtension()->id(), false, NULL);
EXPECT_EQ(1, observer.closing_count());
@@ -1254,7 +1256,8 @@
CommandUpdater* command_updater =
browser()->command_controller()->command_updater();
// Disable extensions. This should disable Extensions menu.
- browser()->profile()->GetExtensionService()->set_extensions_enabled(false);
+ extensions::ExtensionSystem::Get(browser()->profile())->extension_service()->
+ set_extensions_enabled(false);
// Set Incognito to DISABLED.
IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(),
IncognitoModePrefs::DISABLED);
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index a178818d..e1c0dde 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -11,6 +11,7 @@
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -268,7 +269,8 @@
[BrowserActionsController registerUserPrefs:profile_->GetPrefs()];
observer_.reset(new ExtensionServiceObserverBridge(self, browser_));
- ExtensionService* extensionService = profile_->GetExtensionService();
+ ExtensionService* extensionService =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
// |extensionService| can be NULL in Incognito.
if (extensionService) {
toolbarModel_ = extensionService->toolbar_model();
@@ -767,7 +769,8 @@
// Only display incognito-enabled extensions while in incognito mode.
return
(!profile_->IsOffTheRecord() ||
- profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsIncognitoEnabled(extension->id()));
}
- (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
index c9866285..5ed0ad845 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm
@@ -62,7 +62,7 @@
// ExtensionUninstallDialog::Delegate:
virtual void ExtensionUninstallAccepted() {
- profile_->GetExtensionService()->
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
UninstallExtension(extension_->id(), false, NULL);
}
virtual void ExtensionUninstallCanceled() {}
@@ -223,8 +223,8 @@
break;
}
case kExtensionContextHide: {
- ExtensionService* extension_service =
- browser_->profile()->GetExtensionService();
+ ExtensionService* extension_service = extensions::ExtensionSystem::Get(
+ browser_->profile())->extension_service();
extension_service->extension_prefs()->
SetBrowserActionVisibility(extension_, false);
break;
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index 45bc0f1..d652f6c 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -19,6 +19,7 @@
#include "chrome/browser/extensions/api/tabs/tabs.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/location_bar_controller.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -564,8 +565,8 @@
const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
profile_)->GetTemplateURLForKeyword(keyword);
if (template_url && template_url->IsExtensionKeyword()) {
- return profile_->GetExtensionService()->GetOmniboxIcon(
- template_url->GetExtensionId()).AsNSImage();
+ return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
}
return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index eb2fa88..9614601 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_context_menu_model.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser.h"
@@ -502,8 +503,8 @@
desired_width_(0),
start_width_(0),
weak_factory_(this) {
- ExtensionService* extension_service = profile_->GetExtensionService();
- // The |extension_service| can be NULL in Incognito.
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!extension_service)
return;
@@ -698,7 +699,8 @@
const Extension* extension) {
// Only display incognito-enabled extensions while in incognito mode.
return (!profile_->IsOffTheRecord() ||
- profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsIncognitoEnabled(extension->id()));
}
void BrowserActionsToolbarGtk::HidePopup() {
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index c1e36679..707921ea 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -14,6 +14,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/platform_app_launcher.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/browser/intents/cws_intents_registry_factory.h"
@@ -276,7 +277,8 @@
DefaultsUsage suppress_defaults) {
web_intents::RecordServiceInvoke(uma_bucket_);
uma_reporter_->ResetServiceActiveTimer();
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
DCHECK(extension_service);
#if defined(TOOLKIT_VIEWS)
@@ -652,7 +654,7 @@
void WebIntentPickerController::OnCWSIntentServicesAvailable(
const CWSIntentsRegistry::IntentExtensionList& extensions) {
ExtensionServiceInterface* extension_service =
- profile_->GetExtensionService();
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
std::vector<WebIntentPickerModel::SuggestedExtension> suggestions;
for (size_t i = 0; i < extensions.size(); ++i) {
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index a398f10..721be38 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/browser_process.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/first_run/first_run.h"
#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -64,7 +65,8 @@
const Extension** out_app_extension) {
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(app_name.c_str())));
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
*out_app_extension = service->GetExtensionById(
last_loaded_extension_id_, false);
ASSERT_TRUE(*out_app_extension);
@@ -75,7 +77,8 @@
void SetAppLaunchPref(const std::string& app_id,
extensions::ExtensionPrefs::LaunchType launch_type) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->extension_prefs()->SetLaunchType(app_id, launch_type);
}
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 18937d5..cd2e21ea 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -7,6 +7,7 @@
#include "base/compiler_specific.h"
#include "base/stl_util.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -79,8 +80,10 @@
ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_task_factory_(this)) {
set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);
- if (profile_->GetExtensionService()) {
- model_ = profile_->GetExtensionService()->toolbar_model();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
+ if (service) {
+ model_ = service->toolbar_model();
model_->AddObserver(this);
}
@@ -502,7 +505,8 @@
void BrowserActionsContainer::MoveBrowserAction(const std::string& extension_id,
size_t new_index) {
- ExtensionService* service = profile_->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (service) {
const Extension* extension = service->GetExtensionById(extension_id, false);
model_->MoveBrowserAction(extension, new_index);
@@ -627,7 +631,8 @@
// Enlarge the container if it was already at maximum size and we're not in
// the middle of upgrading.
if ((model_->GetVisibleIconCount() < 0) &&
- !profile_->GetExtensionService()->IsBeingUpgraded(extension)) {
+ !extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsBeingUpgraded(extension)) {
suppress_chevron_ = true;
SaveDesiredSizeAndAnimate(ui::Tween::LINEAR, visible_actions + 1);
} else {
@@ -651,7 +656,8 @@
// If the extension is being upgraded we don't want the bar to shrink
// because the icon is just going to get re-added to the same location.
- if (profile_->GetExtensionService()->IsBeingUpgraded(extension))
+ if (extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsBeingUpgraded(extension))
return;
if (browser_action_views_.size() > visible_actions) {
@@ -810,7 +816,8 @@
// Only display incognito-enabled extensions while in incognito mode.
return
(!profile_->IsOffTheRecord() ||
- profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsIncognitoEnabled(extension->id()));
}
void BrowserActionsContainer::ShowPopup(
diff --git a/chrome/browser/ui/views/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
index 1a068bc0..3849eebf 100644
--- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_action_manager.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/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_notification_types.h"
@@ -240,7 +241,8 @@
std::string idA = browser_actions_bar()->GetExtensionId(0);
// Force hide this browser action.
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
service->extension_prefs()->SetBrowserActionVisibility(
service->GetExtensionById(idA, false), false);
EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 71163455..9c850d6 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -765,8 +765,8 @@
TemplateURLServiceFactory::GetForProfile(profile_)->
GetTemplateURLForKeyword(keyword);
if (template_url && template_url->IsExtensionKeyword()) {
- gfx::Image image = profile_->GetExtensionService()->GetOmniboxIcon(
- template_url->GetExtensionId());
+ gfx::Image image = extensions::ExtensionSystem::Get(profile_)->
+ extension_service()->GetOmniboxIcon(template_url->GetExtensionId());
selected_keyword_view_->SetImage(image.AsImageSkia());
selected_keyword_view_->set_is_extension_icon(true);
} else {
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index 2ed1365..e8d9c04 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/extensions/file_manager_util.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/shell_window_registry.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sessions/session_tab_helper.h"
@@ -153,7 +154,8 @@
if (profile_) {
MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(&ExtensionService::ReloadExtension,
- base::Unretained(profile_->GetExtensionService()),
+ base::Unretained(extensions::ExtensionSystem::Get(profile_)->
+ extension_service()),
extension_id));
}
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index 78f360d..139971d 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -15,6 +15,7 @@
#include "base/threading/thread.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/image_loader.h"
#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -292,7 +293,8 @@
std::string extension_id = path_parts.at(0);
const extensions::Extension* extension =
- profile_->GetExtensionService()->GetInstalledExtension(extension_id);
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ GetInstalledExtension(extension_id);
if (!extension)
return false;
