chrome/browser/extensions/extension_browsertest.cc - Issue 10807047: Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows…

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_browsertest.cc

Issue 10807047: Create content\public\test\test_utils.h to hold common test classes that are used by unit and brows… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/content_script_apitest.cc ('k') | chrome/browser/extensions/extension_crash_recovery_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_browsertest.cc

===================================================================

--- chrome/browser/extensions/extension_browsertest.cc (revision 147577)

+++ chrome/browser/extensions/extension_browsertest.cc (working copy)

@@ -115,7 +115,7 @@

// incognito disabled and file access enabled, so we don't wait in those

// cases.

{

- ui_test_utils::WindowedNotificationObserver load_signal(

+ content::WindowedNotificationObserver load_signal(

chrome::NOTIFICATION_EXTENSION_LOADED,

content::Source<Profile>(browser()->profile()));

CHECK(!service->IsIncognitoEnabled(extension_id));

@@ -129,7 +129,7 @@

}

{

- ui_test_utils::WindowedNotificationObserver load_signal(

+ content::WindowedNotificationObserver load_signal(

chrome::NOTIFICATION_EXTENSION_LOADED,

content::Source<Profile>(browser()->profile()));

CHECK(service->AllowFileAccess(extension));

@@ -490,7 +490,7 @@

const GURL& url,

bool newtab_process_should_equal_opener,

content::WebContents** newtab_result) {

- ui_test_utils::WindowedNotificationObserver observer(

+ content::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::NotificationService::AllSources());

ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

@@ -518,7 +518,7 @@

void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,

const GURL& url) {

bool result = false;

- ui_test_utils::WindowedNotificationObserver observer(

+ content::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::NotificationService::AllSources());

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(