chrome/browser/extensions/extension_startup_browsertest.cc - Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused…

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 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (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/extension_resource_request_policy_apitest.cc ('k') | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_startup_browsertest.cc

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

--- chrome/browser/extensions/extension_startup_browsertest.cc (revision 148111)

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

@@ -23,6 +23,7 @@

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/test/browser_test_utils.h"

#include "net/base/net_util.h"

// This file contains high-level startup tests for the extensions system. We've

@@ -117,7 +118,7 @@

ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(test_file));

bool result = false;

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send("

L"document.defaultView.getComputedStyle(document.body, null)."

@@ -126,7 +127,7 @@

EXPECT_EQ(expect_css, result);

result = false;

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title == 'Modified')",

&result));