PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.externalnav;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.content.Context;
@@ skipping 64 matching lines @@
         private final CallbackHelper mLoadFailCallback;
 
         TestTabObserver(final CallbackHelper finishCallback, final CallbackHelper pageFailCallback,
                 final CallbackHelper loadFailCallback) {
             mFinishCallback = finishCallback;
             mPageFailCallback = pageFailCallback;
             mLoadFailCallback = loadFailCallback;
         }
 
         @Override
+        public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
+                boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
+                boolean isFragmentNavigation, Integer pageTransition, int errorCode,
+                int httpStatusCode) {
+            if (errorCode != 0) {
+                mLoadFailCallback.notifyCalled();
+            }
+        }
+
+        @Override
         public void onPageLoadFinished(Tab tab) {
             mFinishCallback.notifyCalled();
         }
 
         @Override
         public void onPageLoadFailed(Tab tab, int errorCode) {
             mPageFailCallback.notifyCalled();
         }
 
         @Override
-        public void onDidFailLoad(Tab tab, boolean isProvisionalLoad, boolean isMainFrame,
-                int errorCode, String description, String failingUrl) {
+        public void onDidFailLoad(Tab tab, boolean isMainFrame, int errorCode, String description,
+                String failingUrl) {
             mLoadFailCallback.notifyCalled();
         }
 
         @Override
         public void onDestroyed(Tab tab) {
             // A new tab is destroyed when loading is overridden while opening it.
             mPageFailCallback.notifyCalled();
         }
     }
 
@@ skipping 232 matching lines @@
                 return mActivityMonitor.getHits();
             }
         }));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 }