chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java - Issue 481803004: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

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/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

Issue 481803004: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed few nits. Created 6 years, 3 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

« chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTab.java » ('j') | chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

index 38181b5f2efb89259904334c4c2a2ebac2d0903c..a0bbdccb1598fb61e04659cd4dbf2c50feedcfb8 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

@@ -184,7 +184,8 @@ public class ModalDialogTest extends ChromeShellTestBase {

"Stay on this page");

clickCancel(jsDialog);

- assertEquals(BEFORE_UNLOAD_URL, getActivity().getActiveContentViewCore().getUrl());

+ assertEquals(BEFORE_UNLOAD_URL, getActivity().getActiveContentViewCore().

Ted C 2014/09/12 00:40:36 same dot wrapping comment here

AKVT 2014/09/12 14:37:11 Done.

+ getWebContents().getUrl());

executeJavaScriptAndWaitForDialog("history.back();");

jsDialog = getCurrentDialog();

@@ -198,7 +199,8 @@ public class ModalDialogTest extends ChromeShellTestBase {

int callCount = onPageLoaded.getCallCount();

clickOk(jsDialog);

onPageLoaded.waitForCallback(callCount);

- assertEquals(EMPTY_PAGE, getActivity().getActiveContentViewCore().getUrl());

+ assertEquals(EMPTY_PAGE, getActivity().getActiveContentViewCore().

+ getWebContents().getUrl());

}

/**