Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1423)

Unified Diff: chrome/browser/extensions/extension_browsertest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 04e95f1c2a50ffd149b9d8d3c673f6a4423df768..0933e74c7068b1ef673cc099c48e20663c211a69 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -79,7 +79,8 @@ void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
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::LoadExtensionIncognito(
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 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
}
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::ReloadExtension(const std::string& extension_id) {
}
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::WaitForExtensionLoadError() {
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.
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_context_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698