chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.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/extensions/api/extension_action/page_as_browser_action_apitest.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

« no previous file with comments | « chrome/browser/extensions/api/extension_action/page_action_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/script_badge_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

index 58e2ada0f649d926020311387fa2b4f80c5aead2..7544b842c7e365c41a4617193a396c40bc2718be 100644

--- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/browser/extensions/extension_prefs.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

@@ -60,8 +61,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

ASSERT_FALSE(extension_action_manager()->GetPageAction(*extension));

// With the "action box" there won't be browser actions unless they're pinned.

- ExtensionPrefs* prefs =

- browser()->profile()->GetExtensionService()->extension_prefs();

+ ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(

+ browser()->profile())->extension_service()->extension_prefs();

prefs->SetBrowserActionVisibility(extension, true);

// Test that there is a browser action in the toolbar.

@@ -86,7 +87,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

{

// Simulate the page action being clicked.

ResultCatcher catcher;

- ExtensionService* service = browser()->profile()->GetExtensionService();

+ ExtensionService* service = extensions::ExtensionSystem::Get(

+ browser()->profile())->extension_service();

service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);

EXPECT_TRUE(catcher.GetNextResult());

}

@@ -128,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) {

// install a page action popup.

{

ResultCatcher catcher;

- ExtensionService* service = browser()->profile()->GetExtensionService();

+ ExtensionService* service = extensions::ExtensionSystem::Get(

+ browser()->profile())->extension_service();

service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);

ASSERT_TRUE(catcher.GetNextResult());

}