content/browser/fileapi/file_system_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: content/browser/fileapi/file_system_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 | « content/browser/dom_storage/dom_storage_browsertest.cc ('k') | content/browser/in_process_webkit/indexed_db_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/fileapi/file_system_browsertest.cc

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

--- content/browser/fileapi/file_system_browsertest.cc (revision 148111)

+++ content/browser/fileapi/file_system_browsertest.cc (working copy)

@@ -14,6 +14,7 @@

#include "chrome/test/base/ui_test_utils.h"

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

#include "content/public/common/content_switches.h"

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

#include "webkit/quota/quota_manager.h"

using content::BrowserThread;

@@ -43,7 +44,7 @@

chrome::GetActiveWebContents(the_browser)->GetURL().ref();

if (result != "pass") {

std::string js_result;

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(

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

L"window.domAutomationController.send(getLog())", &js_result));

FAIL() << "Failed: " << js_result;