content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.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: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.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: Fixed review comments and rebased the patch. 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

« no previous file with comments | « content/shell/android/java/src/org/chromium/content_shell/Shell.java ('k') | content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java

diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java

index ddeac731fb0f5f85c2d5aa559fc61cb3bb574e79..a1ef29294cb036b897a620c2999c0d5ae25e083c 100644

--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java

+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java

@@ -25,7 +25,8 @@ public class ContentShellShellManagementTest extends ContentShellTestBase {

@Feature({"Main"})

public void testMultipleShellsLaunched() throws InterruptedException {

final ContentShellActivity activity = launchContentShellWithUrl(TEST_PAGE_1);

- assertEquals(TEST_PAGE_1, activity.getActiveShell().getContentViewCore().getUrl());

+ assertEquals(TEST_PAGE_1, activity.getActiveShell().getContentViewCore()

+ .getWebContents().getUrl());

Shell previousActiveShell = activity.getActiveShell();

assertFalse(previousActiveShell.isDestroyed());

@@ -37,7 +38,8 @@ public class ContentShellShellManagementTest extends ContentShellTestBase {

}

});

waitForActiveShellToBeDoneLoading();

- assertEquals(TEST_PAGE_2, activity.getActiveShell().getContentViewCore().getUrl());

+ assertEquals(TEST_PAGE_2, activity.getActiveShell().getContentViewCore()

+ .getWebContents().getUrl());

assertNotSame(previousActiveShell, activity.getActiveShell());

assertTrue(previousActiveShell.isDestroyed());