PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java

 // Copyright 2013 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.infobar;
 
 import android.content.Context;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ skipping 71 matching lines @@
         /**
          * Called when the InfobarContainer is attached to the window.
          * @param hasInfobars True if infobar container has infobars to show.
          */
         void onInfoBarContainerAttachedToWindow(boolean hasInfobars);
     }
 
     /** Resets the state of the InfoBarContainer when the user navigates. */
     private final TabObserver mTabObserver = new EmptyTabObserver() {
         @Override
-        public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
-                boolean isNavigationToDifferentPage, boolean isFragmentNavigation,
-                int statusCode) {
-            setIsObscuredByOtherView(false);
+        public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
+                boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
+                boolean isFragmentNavigation, Integer pageTransition, int errorCode,
+                int httpStatusCode) {
+            if (hasCommitted && isInMainFrame) {
+                setIsObscuredByOtherView(false);
+            }
         }
 
         @Override
         public void onContentChanged(Tab tab) {
             mTabView.removeOnAttachStateChangeListener(mAttachedStateListener);
             mTabView = tab.getView();
             mTabView.addOnAttachStateChangeListener(mAttachedStateListener);
         }
 
         @Override
@@ skipping 282 matching lines @@
         }
 
         super.onLayout(changed, l, t, r, b);
     }
 
     private native long nativeInit();
     private native void nativeSetWebContents(
             long nativeInfoBarContainerAndroid, WebContents webContents);
     private native void nativeDestroy(long nativeInfoBarContainerAndroid);
 }