chrome/browser/extensions/extension_startup_browsertest.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/browser/extensions/extension_startup_browsertest.cc

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

Patch Set: Latest master for cq 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/browser/extensions/extension_startup_browsertest.cc

diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc

index 09e1a69c227ce27daa8ef5069589e2eebddccc8a..5c14c654109e49ac55b82b24b1167fe610035e54 100644

--- a/chrome/browser/extensions/extension_startup_browsertest.cc

+++ b/chrome/browser/extensions/extension_startup_browsertest.cc

@@ -101,7 +101,8 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {

ui_test_utils::WindowedNotificationObserver user_scripts_observer(

chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,

content::NotificationService::AllSources());

- UserScriptMaster* master = browser()->profile()->GetUserScriptMaster();

+ extensions::UserScriptMaster* master =

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

if (!master->ScriptsReady())

user_scripts_observer.Wait();

ASSERT_TRUE(master->ScriptsReady());