content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.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/ContentShellTestBase.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/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java ('k') | content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.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/ContentShellTestBase.java

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

index 4ba3cc99d2878674dba0bf9d6623f24507626ad9..186f77a8dc671894e9289567dde21be54c2e0315 100644

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

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

@@ -86,7 +86,7 @@ public class ContentShellTestBase extends ActivityInstrumentationTestCase2<Conte

launchContentShellWithUrl(UrlUtils.getTestFileUrl(url));

assertNotNull(getActivity());

assertTrue(waitForActiveShellToBeDoneLoading());

- assertEquals(UrlUtils.getTestFileUrl(url), getContentViewCore().getUrl());

+ assertEquals(UrlUtils.getTestFileUrl(url), getContentViewCore().getWebContents().getUrl());

}

/**

@@ -138,7 +138,8 @@ public class ContentShellTestBase extends ActivityInstrumentationTestCase2<Conte

// loading because it has no URL set yet. The second is that

// we've set a URL and it actually is loading.

isLoaded.set(!shell.isLoading()

- && !TextUtils.isEmpty(shell.getContentViewCore().getUrl()));

+ && !TextUtils.isEmpty(shell.getContentViewCore()

+ .getWebContents().getUrl()));

} else {

isLoaded.set(false);

}

@@ -168,7 +169,7 @@ public class ContentShellTestBase extends ActivityInstrumentationTestCase2<Conte

new Runnable() {

@Override

public void run() {

- viewCore.loadUrl(params);

+ viewCore.getWebContents().getNavigationController().loadUrl(params);

}

});

}