| Index: android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
|
| index 15c0bcd78eb7788912a0b9d5bc3d5e3d41ee7213..26a0fda611470c9462aa861f80c9b96091a76e5a 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
|
| @@ -52,36 +52,36 @@ public class ClientOnPageFinishedTest extends AwTestBase {
|
| @Feature({"AndroidWebView"})
|
| public void testOnPageFinishedCalledAfterError() throws Throwable {
|
| class LocalTestClient extends TestAwContentsClient {
|
| - private boolean isOnReceivedErrorCalled = false;
|
| - private boolean isOnPageFinishedCalled = false;
|
| - private boolean allowAboutBlank = false;
|
| + private boolean mIsOnReceivedErrorCalled = false;
|
| + private boolean mIsOnPageFinishedCalled = false;
|
| + private boolean mAllowAboutBlank = false;
|
|
|
| @Override
|
| public void onReceivedError(int errorCode, String description, String failingUrl) {
|
| assertEquals("onReceivedError called twice for " + failingUrl,
|
| - false, isOnReceivedErrorCalled);
|
| - isOnReceivedErrorCalled = true;
|
| + false, mIsOnReceivedErrorCalled);
|
| + mIsOnReceivedErrorCalled = true;
|
| assertEquals("onPageFinished called before onReceivedError for " + failingUrl,
|
| - false, isOnPageFinishedCalled);
|
| + false, mIsOnPageFinishedCalled);
|
| super.onReceivedError(errorCode, description, failingUrl);
|
| }
|
|
|
| @Override
|
| public void onPageFinished(String url) {
|
| - if (allowAboutBlank && "about:blank".equals(url)) {
|
| + if (mAllowAboutBlank && "about:blank".equals(url)) {
|
| super.onPageFinished(url);
|
| return;
|
| }
|
| assertEquals("onPageFinished called twice for " + url,
|
| - false, isOnPageFinishedCalled);
|
| - isOnPageFinishedCalled = true;
|
| + false, mIsOnPageFinishedCalled);
|
| + mIsOnPageFinishedCalled = true;
|
| assertEquals("onReceivedError not called before onPageFinished for " + url,
|
| - true, isOnReceivedErrorCalled);
|
| + true, mIsOnReceivedErrorCalled);
|
| super.onPageFinished(url);
|
| }
|
|
|
| void setAllowAboutBlank() {
|
| - allowAboutBlank = true;
|
| + mAllowAboutBlank = true;
|
| }
|
| };
|
| LocalTestClient testContentsClient = new LocalTestClient();
|
|
|