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

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.h

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

index 8d9f127c450f66b6df569f04942de185493b6e2f..706072b3093e35dce0fbe156c3017b28182e851e 100644

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

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

@@ -148,7 +148,7 @@ class TestingProfile : public Profile {

virtual Profile* GetOriginalProfile() OVERRIDE;

virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;

virtual ExtensionService* GetExtensionService() OVERRIDE;

- virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;

+ virtual extensions::UserScriptMaster* GetUserScriptMaster() OVERRIDE;

virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;

virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;

void SetExtensionSpecialStoragePolicy(