chrome/browser/extensions/api/extension_action/page_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_action_apitest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: tweaks 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/chrome_content_browser_client.cc ('K') | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | chrome/browser/extensions/api/extension_action/page_as_browser_action_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_action_apitest.cc

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

index 601bfc6e9311a1c4ed9632f20451971082e99cd8..e0e201dba3343f3808756c98bd16138ca753bb42 100644

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

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

@@ -8,6 +8,7 @@

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

#include "chrome/browser/extensions/extension_apitest.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/sessions/session_tab_helper.h"

@@ -56,7 +57,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) {

ResultCatcher catcher;

int tab_id =

ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));

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

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

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

service->browser_event_router()->PageActionExecuted(

browser()->profile(), *action, tab_id, "", 0);

EXPECT_TRUE(catcher.GetNextResult());

@@ -100,7 +102,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, AddPopup) {

// install a page action popup.

{

ResultCatcher catcher;

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

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

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

service->browser_event_router()->PageActionExecuted(

browser()->profile(), *page_action, tab_id, "", 1);

ASSERT_TRUE(catcher.GetNextResult());

@@ -178,7 +181,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, OldPageActions) {

ResultCatcher catcher;

int tab_id =

ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));

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

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

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

ExtensionAction* page_action = GetPageAction(*extension);

service->browser_event_router()->PageActionExecuted(

browser()->profile(), *page_action, tab_id, "", 1);