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

Unified Diff: chrome/browser/extensions/api/management/management_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/api/management/management_browsertest.cc
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index 1b9f9e3160ebfc5278ba480eb82923dfb012c0b5..f91dbe8f999fbbdbbb653f21bfef42997154cc78 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, InstallThenCancel) {
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, MAYBE_InstallRequiresConfirm) {
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 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) {
// 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 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
// 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,
}
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 @@ const char* kForceInstallNotEmptyHelp =
// 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, ExternalPolicyRefresh) {
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;

Powered by Google App Engine
This is Rietveld 408576698