chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 11365181: Remove GetExtensionService from Profile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

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 0c60aa129ed95ce13a5ed45bb739eec8c656b249..a9b8d267b3927ecdc17e148b74e8a185034f21a7 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 @@ class LauncherAppBrowserTest : public ExtensionBrowserTest {

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 @@ class LauncherAppBrowserTest : public ExtensionBrowserTest {

}

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.