WebContentsObserver update for PlzNavigate methods

content/browser/android/web_contents_observer_proxy.cc

 // 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.
 
 #include "content/browser/android/web_contents_observer_proxy.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/android/media_metadata_android.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/common/media_metadata.h"
+#include "jni/NavigationHandle_jni.h"
 #include "jni/WebContentsObserverProxy_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
+namespace {
+
+// static
+static base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationHandle(
+    JNIEnv* env,
+    content::NavigationHandle* navigation_handle) {
+  ScopedJavaLocalRef<jstring> j_url(
+      ConvertUTF8ToJavaString(env, navigation_handle->GetURL().spec()));
+
+  GURL validated_url(navigation_handle->GetURL());
+  if (navigation_handle->GetRenderFrameHost() &&
+      navigation_handle->GetRenderFrameHost()->GetProcess()) {
+    navigation_handle->GetRenderFrameHost()->GetProcess()->FilterURL(
+        false, &validated_url);
+  }
+
+  ScopedJavaLocalRef<jstring> j_validated_url(
+      ConvertUTF8ToJavaString(env, validated_url.spec()));
+  return content::Java_NavigationHandle_createNavigationHandle(
+      env, j_url, j_validated_url, navigation_handle->IsInMainFrame(),
+      navigation_handle->IsSamePage(), navigation_handle->GetPageTransition(),
+      navigation_handle->HasCommitted(), navigation_handle->IsErrorPage());
+}
+
+}  // namespace
+
 namespace content {
 
 // TODO(dcheng): File a bug. This class incorrectly passes just a frame ID,
 // which is not sufficient to identify a frame (since frame IDs are scoped per
 // render process, and so may collide).
 WebContentsObserverProxy::WebContentsObserverProxy(JNIEnv* env,
                                                    jobject obj,
                                                    WebContents* web_contents)
     : WebContentsObserver(web_contents) {
   DCHECK(obj);
@@ skipping 35 matching lines @@
 
 void WebContentsObserverProxy::RenderProcessGone(
     base::TerminationStatus termination_status) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   jboolean was_oom_protected =
       termination_status == base::TERMINATION_STATUS_OOM_PROTECTED;
   Java_WebContentsObserverProxy_renderProcessGone(env, obj, was_oom_protected);
 }
 
-void WebContentsObserverProxy::DidFinishNavigation(
-    NavigationHandle* navigation_handle) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj(java_observer_);
-  ScopedJavaLocalRef<jstring> jstring_url(
-      ConvertUTF8ToJavaString(env, web_contents()->GetVisibleURL().spec()));
-  Java_WebContentsObserverProxy_didFinishNavigation(
-      env, obj, navigation_handle->IsInMainFrame(),
-      navigation_handle->IsErrorPage(), navigation_handle->HasCommitted());
-}
-
 void WebContentsObserverProxy::DidStartLoading() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, web_contents()->GetVisibleURL().spec()));
   if (auto* entry = web_contents()->GetController().GetPendingEntry()) {
     base_url_of_last_started_data_url_ = entry->GetBaseURLForDataURL();
   }
   Java_WebContentsObserverProxy_didStartLoading(env, obj, jstring_url);
 }
@@ skipping 76 matching lines @@
   Java_WebContentsObserverProxy_didNavigateAnyFrame(
       env, obj, jstring_url, jstring_base_url, jboolean_is_reload);
 }
 
 void WebContentsObserverProxy::DocumentAvailableInMainFrame() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   Java_WebContentsObserverProxy_documentAvailableInMainFrame(env, obj);
 }
 
+void WebContentsObserverProxy::DidStartNavigation(
+    NavigationHandle* navigation_handle) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(java_observer_);
+  Java_WebContentsObserverProxy_didStartNavigation(
+      env, obj, CreateJavaNavigationHandle(env, navigation_handle));
+}
+
+void WebContentsObserverProxy::DidRedirectNavigation(
+    NavigationHandle* navigation_handle) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(java_observer_);
+  Java_WebContentsObserverProxy_didRedirectNavigation(
+      env, obj, CreateJavaNavigationHandle(env, navigation_handle));
+}
+
+void WebContentsObserverProxy::ReadyToCommitNavigation(
+    NavigationHandle* navigation_handle) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(java_observer_);
+  Java_WebContentsObserverProxy_readyToCommitNavigation(
+      env, obj, CreateJavaNavigationHandle(env, navigation_handle));
+}
+
+void WebContentsObserverProxy::DidFinishNavigation(
+    NavigationHandle* navigation_handle) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(java_observer_);
+  Java_WebContentsObserverProxy_didFinishNavigation(
+      env, obj, CreateJavaNavigationHandle(env, navigation_handle));
+}
+
 void WebContentsObserverProxy::DidStartProvisionalLoadForFrame(
     RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     bool is_error_page) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, validated_url.spec()));
   // TODO(dcheng): Does Java really need the parent frame ID? It doesn't appear
   // to be used at all, and it just adds complexity here.
@@ skipping 140 matching lines @@
     // a base URL if there has been a loadUrl("javascript:...") after
     // loadDataWithBaseUrl.
     *url = base_url_of_last_started_data_url_.possibly_invalid_spec();
   }
 }
 
 bool RegisterWebContentsObserverProxy(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 }  // namespace content