chrome/browser/net/load_timing_observer_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/net/load_timing_observer_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/loadtimes_extension_bindings_browsertest.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/load_timing_observer_browsertest.cc

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

--- chrome/browser/net/load_timing_observer_browsertest.cc (revision 148111)

+++ chrome/browser/net/load_timing_observer_browsertest.cc (working copy)

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

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

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

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

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

#include "googleurl/src/gurl.h"

#include "net/test/test_server.h"

@@ -27,12 +28,12 @@

int response_end = 0;

content::RenderViewHost* render_view_host =

chrome::GetActiveWebContents(browser())->GetRenderViewHost();

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(

+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(

render_view_host, L"",

L"window.domAutomationController.send("

L"window.performance.timing.responseStart - "

L"window.performance.timing.navigationStart)", &response_start));

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(

+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(

render_view_host, L"",

L"window.domAutomationController.send("

L"window.performance.timing.responseEnd - "