chrome/test/base/testing_profile.cc - Issue 10696176: Move UserScript and related into extensions namespace

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/test/base/testing_profile.cc

Issue 10696176: Move UserScript and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 5 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:

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index aa471a87649479b555ec68b5bbc051452a0e478e..a6ac4de983712f49bd25cd6ef90a3c3112c86926 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

@@ -451,7 +451,7 @@ ExtensionService* TestingProfile::GetExtensionService() {

return extensions::ExtensionSystem::Get(this)->extension_service();

}

-UserScriptMaster* TestingProfile::GetUserScriptMaster() {

+extensions::UserScriptMaster* TestingProfile::GetUserScriptMaster() {

return extensions::ExtensionSystem::Get(this)->user_script_master();

}