This is the necessary change in the upstream to fix the issue.

Pipe DidStartNavigationToPendingEntry to WebContentsObserver and TabObserver.

BUG=442726

Review URL: https://codereview.chromium.org/877163005

Cr-Commit-Position: refs/heads/master@{#313866}

chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java

@@ -108,6 +108,9 @@ public class EmptyTabObserver implements TabObserver {
     @Override
     public void onDidDetachInterstitialPage(Tab tab) { }
 
+    @Override
+    public void onDidStartNavigationToPendingEntry(Tab tab, String url) { }
+
     @Override
     public void onBackgroundColorChanged(Tab tab, int color) { }
 

chrome/android/java/src/org/chromium/chrome/browser/Tab.java

@@ -578,6 +578,13 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
                 observer.onDidDetachInterstitialPage(Tab.this);
             }
         }
+
+        @Override
+        public void didStartNavigationToPendingEntry(String url) {
+            for (TabObserver observer : mObservers) {
+                observer.onDidStartNavigationToPendingEntry(Tab.this, url);
+            }
+        }
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java

@@ -260,6 +260,8 @@ public interface TabObserver {
      */
     public void onDidDetachInterstitialPage(Tab tab);
 
+    public void onDidStartNavigationToPendingEntry(Tab tab, String url);
+
     /**
      * Called when the background color for the tab has changed.
      * @param tab The notifying {@link Tab}.

content/browser/android/web_contents_observer_android.cc

@@ -335,6 +335,20 @@ void WebContentsObserverAndroid::DidFirstVisuallyNonEmptyPaint() {
       env, obj.obj());
 }
 
+void WebContentsObserverAndroid::DidStartNavigationToPendingEntry(
+    const GURL& url,
+    NavigationController::ReloadType reload_type) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
+  if (obj.is_null())
+    return;
+  ScopedJavaLocalRef<jstring> jstring_url(
+      ConvertUTF8ToJavaString(env, url.spec()));
+
+  Java_WebContentsObserver_didStartNavigationToPendingEntry(env, obj.obj(),
+                                                            jstring_url.obj());
+}
+
 bool RegisterWebContentsObserverAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }

content/browser/android/web_contents_observer_android.h

@@ -32,46 +32,45 @@ class WebContentsObserverAndroid : public WebContentsObserver {
   void Destroy(JNIEnv* env, jobject obj);
 
  private:
-  virtual void RenderViewReady() override;
-  virtual void RenderProcessGone(
-      base::TerminationStatus termination_status) override;
-  virtual void DidStartLoading(RenderViewHost* render_view_host) override;
-  virtual void DidStopLoading(RenderViewHost* render_view_host) override;
-  virtual void DidFailProvisionalLoad(
-      RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      int error_code,
-      const base::string16& error_description) override;
-  virtual void DidFailLoad(RenderFrameHost* render_frame_host,
-                           const GURL& validated_url,
-                           int error_code,
-                           const base::string16& error_description) override;
-  virtual void DidNavigateMainFrame(const LoadCommittedDetails& details,
-                                    const FrameNavigateParams& params) override;
-  virtual void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
-                                   const LoadCommittedDetails& details,
-                                   const FrameNavigateParams& params) override;
-  virtual void DocumentAvailableInMainFrame() override;
-  virtual void DidFirstVisuallyNonEmptyPaint() override;
-  virtual void DidStartProvisionalLoadForFrame(
-      RenderFrameHost* render_frame_host,
-      const GURL& validated_url,
-      bool is_error_page,
-      bool is_iframe_srcdoc) override;
-  virtual void DidCommitProvisionalLoadForFrame(
+  void RenderViewReady() override;
+  void RenderProcessGone(base::TerminationStatus termination_status) override;
+  void DidStartLoading(RenderViewHost* render_view_host) override;
+  void DidStopLoading(RenderViewHost* render_view_host) override;
+  void DidFailProvisionalLoad(RenderFrameHost* render_frame_host,
+                              const GURL& validated_url,
+                              int error_code,
+                              const base::string16& error_description) override;
+  void DidFailLoad(RenderFrameHost* render_frame_host,
+                   const GURL& validated_url,
+                   int error_code,
+                   const base::string16& error_description) override;
+  void DidNavigateMainFrame(const LoadCommittedDetails& details,
+                            const FrameNavigateParams& params) override;
+  void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
+                           const LoadCommittedDetails& details,
+                           const FrameNavigateParams& params) override;
+  void DocumentAvailableInMainFrame() override;
+  void DidFirstVisuallyNonEmptyPaint() override;
+  void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
+                                       const GURL& validated_url,
+                                       bool is_error_page,
+                                       bool is_iframe_srcdoc) override;
+  void DidCommitProvisionalLoadForFrame(
       RenderFrameHost* render_frame_host,
       const GURL& url,
       ui::PageTransition transition_type) override;
-  virtual void DidFinishLoad(RenderFrameHost* render_frame_host,
-                             const GURL& validated_url) override;
-  virtual void DocumentLoadedInFrame(
-      RenderFrameHost* render_frame_host) override;
-  virtual void NavigationEntryCommitted(
+  void DidFinishLoad(RenderFrameHost* render_frame_host,
+                     const GURL& validated_url) override;
+  void DocumentLoadedInFrame(RenderFrameHost* render_frame_host) override;
+  void NavigationEntryCommitted(
       const LoadCommittedDetails& load_details) override;
-  virtual void WebContentsDestroyed() override;
-  virtual void DidAttachInterstitialPage() override;
-  virtual void DidDetachInterstitialPage() override;
-  virtual void DidChangeThemeColor(SkColor color) override;
+  void WebContentsDestroyed() override;
+  void DidAttachInterstitialPage() override;
+  void DidDetachInterstitialPage() override;
+  void DidChangeThemeColor(SkColor color) override;
+  void DidStartNavigationToPendingEntry(
+      const GURL& url,
+      NavigationController::ReloadType reload_type) override;
 
   void DidFailLoadInternal(bool is_provisional_load,
                            bool is_main_frame,

content/public/android/java/src/org/chromium/content/browser/WebContentsObserver.java

@@ -195,6 +195,14 @@ public abstract class WebContentsObserver {
     public void didChangeThemeColor(int color) {
     }
 
+    /**
+     * Called when we started navigation to the pending entry.
+     * @param url        The URL that we are navigating to.
+     */
+    @CalledByNative
+    public void didStartNavigationToPendingEntry(String url) {
+    }
+
     /**
      * Destroy the corresponding native object.
      */