chrome/browser/extensions/isolated_app_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/isolated_app_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_startup_browsertest.cc ('k') | chrome/browser/extensions/lazy_background_page_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/isolated_app_browsertest.cc

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

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

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

@@ -19,13 +19,14 @@

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

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

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

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

#include "net/base/mock_host_resolver.h"

+using content::ExecuteJavaScript;

+using content::ExecuteJavaScriptAndExtractString;

using content::NavigationController;

using content::WebContents;

using content::RenderViewHost;

-using ui_test_utils::ExecuteJavaScript;

-using ui_test_utils::ExecuteJavaScriptAndExtractString;

namespace {

@@ -120,11 +121,11 @@

RenderViewHost* app1_rvh = tab1->GetRenderViewHost();

RenderViewHost* app2_rvh = tab2->GetRenderViewHost();

RenderViewHost* non_app_rvh = tab3->GetRenderViewHost();

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

non_app_rvh, L"",

L"window.localStorage.setItem('testdata', 'ls_normal');"));

@@ -227,11 +228,11 @@

chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();

RenderViewHost* non_app_rvh =

chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost();

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

app1_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app1');"));

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

app2_rvh, L"", L"window.localStorage.setItem('testdata', 'ls_app2');"));

- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

+ ASSERT_TRUE(ExecuteJavaScript(

non_app_rvh, L"",

L"window.localStorage.setItem('testdata', 'ls_normal');"));