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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: response to sky 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/ui/startup/startup_browser_creator_browsertest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index a398f1003fa072a5b9c5ea39a39ee1ccc2461657..721be3817c7d11a346f606978b6cb65b5cd3349b 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 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
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 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest {
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);
}

Powered by Google App Engine
This is Rietveld 408576698