chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java - Issue 227803004: ContentView->ContentViewCore in ContentViewRenderView

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/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

Issue 227803004: ContentView->ContentViewCore in ContentViewRenderView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 8 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/shell/java/src/org/chromium/chrome/shell/TabManager.java ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java » ('j') | content/shell/android/java/src/org/chromium/content_shell/ShellManager.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

index 7dd0eb4c9dd0e3bfcf36c28642e7c87f9853208b..62ab37fbc0e5a1064fcb5120f49c23086cf88ab1 100644

--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

@@ -16,6 +16,9 @@ import java.util.Locale;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicReference;

+/**

+ * Basic sanity test for loading urls in ChromeShell.

+ */

public class ChromeShellUrlTest extends ChromeShellTestBase {

// URL used for base tests.

private static final String URL = "data:text";

@@ -101,7 +104,8 @@ public class ChromeShellUrlTest extends ChromeShellTestBase {

ContentViewRenderView contentViewRenderView =

new ContentViewRenderView(getInstrumentation().getTargetContext(),

activity.getWindowAndroid());

- contentViewRenderView.setCurrentContentView(activity.getActiveContentView());

+ contentViewRenderView.setCurrentContentViewCore(

+ activity.getActiveContentView().getContentViewCore());

Yaron 2014/04/07 18:48:32 I have plans to remove the extra hop |getContentVi

}

});

} catch (Throwable e) {