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

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

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

Patch Set: rebased Created 6 years, 2 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/WebsiteSettingsPopup.java ('K') | « content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 47fa6a73667ee6da97af9a6bbb46aaeb0870d363..b1088ffafc9d4fd06f35499257a25493212cfc29 100644

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

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

@@ -27,10 +27,10 @@ public class InterstitialPageTest extends ContentShellTestBase {

private static final String URL = UrlUtils.encodeHtmlDataUri(

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

- private static class TestWebContentsObserverAndroid extends WebContentsObserverAndroid {

+ private static class TestWebContentsObserver extends WebContentsObserver {

private boolean mInterstitialShowing;

- public TestWebContentsObserverAndroid(WebContents webContents) {

+ public TestWebContentsObserver(WebContents webContents) {

super(webContents);

}

@@ -111,12 +111,15 @@ public class InterstitialPageTest extends ContentShellTestBase {

proceed();

}

};

- TestWebContentsObserverAndroid observer = ThreadUtils.runOnUiThreadBlocking(

- new Callable<TestWebContentsObserverAndroid>() {

+ TestWebContentsObserver observer = ThreadUtils.runOnUiThreadBlocking(

nyquist 2014/10/14 17:15:16 The Java code is supposed to be wrapped at 100 cha

wajahat 2014/10/15 07:15:22 Wrapping at 100 chars, Done.

+ new Callable<TestWebContentsObserver>() {

@Override

- public TestWebContentsObserverAndroid call() throws Exception {

- getWebContents().showInterstitialPage(URL, delegate.getNative());

- return new TestWebContentsObserverAndroid(getWebContents());

+ public TestWebContentsObserver call()

+ throws Exception {

+ getWebContents().showInterstitialPage(URL,

+ delegate.getNative());

+ return new TestWebContentsObserver(

+ getWebContents());

}

});