content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java - Issue 589113002: Rename java WebContentsObserverAndroid to WebContentsObserver

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

Issue 589113002: Rename java WebContentsObserverAndroid to WebContentsObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes incorporated 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

« content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java b/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

index e5084a37ec41723156213dab061d8b556b4c0ec2..839398a75319479c0a2a9569bab9efa07da095ae 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java

@@ -16,16 +16,16 @@ import org.chromium.content_shell_apk.ContentShellTestBase;

import java.util.concurrent.Callable;

/**

- * Tests for the WebContentsObserverAndroid APIs.

+ * Tests for the WebContentsObserver APIs.

-public class WebContentsObserverAndroidTest extends ContentShellTestBase {

+public class WebContentsObserverTest extends ContentShellTestBase {

nyquist 2014/09/25 16:57:28 This should match the file name.

wajahat 2014/09/29 14:43:25 Done, reverted this change

private static final String URL = UrlUtils.encodeHtmlDataUri(

"<html><head></head><body>didFirstVisuallyNonEmptyPaint test</body></html>");

- private static class TestWebContentsObserverAndroid extends WebContentsObserverAndroid {

+ private static class TestWebContentsObserver extends WebContentsObserver {

private CallbackHelper mDidFirstVisuallyNonEmptyPaintCallbackHelper = new CallbackHelper();

- public TestWebContentsObserverAndroid(WebContents webContents) {

+ public TestWebContentsObserver(WebContents webContents) {

super(webContents);

}

@@ -54,11 +54,11 @@ public class WebContentsObserverAndroidTest extends ContentShellTestBase {

@DisabledTest

public void testDidFirstVisuallyNonEmptyPaint() throws Throwable {

- TestWebContentsObserverAndroid observer = ThreadUtils.runOnUiThreadBlocking(

- new Callable<TestWebContentsObserverAndroid>() {

+ TestWebContentsObserver observer = ThreadUtils.runOnUiThreadBlocking(

+ new Callable<TestWebContentsObserver>() {

@Override

- public TestWebContentsObserverAndroid call() throws Exception {

- return new TestWebContentsObserverAndroid(

+ public TestWebContentsObserver call() throws Exception {

+ return new TestWebContentsObserver(

getContentViewCore().getWebContents());

}

});