chrome/browser/extensions/api/extension_action/browser_action_apitest.cc - Issue 156843004: Remove ExtensionService::extension_prefs()

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/browser_action_apitest.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 months 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/downloads/downloads_api.cc ('k') | chrome/browser/extensions/api/management/management_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3d63e470db08e38f6a124717f046bc820a669de7..dc1bcaa544b6c696818935302d28a28c3dbaf498 100644

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

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

@@ -484,8 +484,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoBasic) {

// Now enable the extension in incognito mode, and test that the browser

// action shows up. Note that we don't update the existing window at the

// moment, so we just create a new one.

- extensions::ExtensionSystem::Get(browser()->profile())->extension_service()->

- extension_prefs()->SetIsIncognitoEnabled(extension->id(), true);

+ extensions::ExtensionPrefs::Get(browser()->profile())

+ ->SetIsIncognitoEnabled(extension->id(), true);

chrome::CloseWindow(incognito_browser);

incognito_browser =

@@ -525,8 +525,10 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {

// Now enable 2 of the extensions in incognito mode, and test that the browser

// actions show up.

- service->extension_prefs()->SetIsIncognitoEnabled(extension_a->id(), true);

- service->extension_prefs()->SetIsIncognitoEnabled(extension_c->id(), true);

+ extensions::ExtensionPrefs* prefs =

+ extensions::ExtensionPrefs::Get(browser()->profile());

+ prefs->SetIsIncognitoEnabled(extension_a->id(), true);

+ prefs->SetIsIncognitoEnabled(extension_c->id(), true);

Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();

Browser* incognito_browser =