| 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.
|
|
|