chrome/browser/apps/custom_launcher_page_browsertest_views.cc - Issue 1257603003: Revert of Add ExecuteJavaScriptForTest and make all tests use it

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/apps/custom_launcher_page_browsertest_views.cc

Issue 1257603003: Revert of Add ExecuteJavaScriptForTest and make all tests use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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/android/javatests/src/org/chromium/chrome/browser/TabsTest.java ('k') | chrome/browser/chromeos/login/lock/screen_locker_tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc

diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc

index eb8aea103b038419bd586748c047d9248ab5cd47..f39ec2e52b06b5d906e2292f9c3f4b99cc18ddf6 100644

--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc

+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc

@@ -113,8 +113,8 @@

enabled ? "launcherPageEnabled" : "launcherPageDisabled";

ExtensionTestMessageListener listener(test_message, false);

- custom_page_frame->ExecuteJavaScriptForTests(

- enabled ? kLauncherPageEnableScript : kLauncherPageDisableScript);

+ custom_page_frame->ExecuteJavaScript(enabled ? kLauncherPageEnableScript

+ : kLauncherPageDisableScript);

listener.WaitUntilSatisfied();

}

@@ -339,7 +339,7 @@

// if the app launcher is already showing.

{

ExtensionTestMessageListener listener("onPageProgressAt1", false);

- custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageShowScript);

+ custom_page_frame->ExecuteJavaScript(kLauncherPageShowScript);

listener.WaitUntilSatisfied();

EXPECT_TRUE(contents_view->IsStateActive(

@@ -353,7 +353,7 @@

app_list_view->GetWidget()->Close();

ExtensionTestMessageListener listener("onPageProgressAt1", false);

- custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageShowScript);

+ custom_page_frame->ExecuteJavaScript(kLauncherPageShowScript);

listener.WaitUntilSatisfied();

@@ -367,7 +367,7 @@

// Ensure launcherPage.hide() hides the launcher page when it's showing.

{

ExtensionTestMessageListener listener("onPageProgressAt0", false);

- custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageHideScript);

+ custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);

listener.WaitUntilSatisfied();

@@ -380,7 +380,7 @@

contents_view->SetActiveState(app_list::AppListModel::STATE_APPS, false);

ExtensionTestMessageListener listener("launcherPageHidden", false);

- custom_page_frame->ExecuteJavaScriptForTests(kLauncherPageHideScript);

+ custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);

listener.WaitUntilSatisfied();

EXPECT_TRUE(