Use LoadURLWithParams in ChromeWebContentsDelegateAndroid

Build a LoadURLParams object from the OpenURLParams and properly set all
parameters on that object when calling into NavigationController.  This makes
sure we set the correct state for the load.

BUG=352083

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273865 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 25 insertions, 4 deletions

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 61b7281..35e2709 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -848,7 +848,8 @@ void ContentViewCoreImpl::LoadUrl(
     jbyteArray post_data,
     jstring base_url_for_data_url,
     jstring virtual_url_for_data_url,
-    jboolean can_load_local_resources) {
+    jboolean can_load_local_resources,
+    jboolean is_renderer_initiated) {
   DCHECK(url);
   NavigationController::LoadURLParams params(
       GURL(ConvertJavaStringToUTF8(env, url)));
@@ -887,6 +888,8 @@ void ContentViewCoreImpl::LoadUrl(
         static_cast<blink::WebReferrerPolicy>(referrer_policy));
   }
 
+  params.is_renderer_initiated = is_renderer_initiated;
+
   LoadUrl(params);
 }
 
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index cabfac0..919dad8 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -88,7 +88,8 @@ class ContentViewCoreImpl : public ContentViewCore,
       jbyteArray post_data,
       jstring base_url_for_data_url,
       jstring virtual_url_for_data_url,
-      jboolean can_load_local_resources);
+      jboolean can_load_local_resources,
+      jboolean is_renderer_initiated);
   base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
   jboolean IsIncognito(JNIEnv* env, jobject obj);
   void SendOrientationChangeEvent(JNIEnv* env, jobject obj, jint orientation);
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 5a1d688..cd68715 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -826,7 +826,8 @@ public class ContentViewCore
                 params.mPostData,
                 params.mBaseUrlForDataUrl,
                 params.mVirtualUrlForDataUrl,
-                params.mCanLoadLocalResources);
+                params.mCanLoadLocalResources,
+                params.mIsRendererInitiated);
     }
 
     /**
@@ -3083,7 +3084,8 @@ public class ContentViewCore
             byte[] postData,
             String baseUrlForDataUrl,
             String virtualUrlForDataUrl,
-            boolean canLoadLocalResources);
+            boolean canLoadLocalResources,
+            boolean isRendererInitiated);
 
     private native String nativeGetURL(long nativeContentViewCoreImpl);
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
index 12a2260..db48442 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
@@ -47,6 +47,7 @@ public class LoadUrlParams {
     String mBaseUrlForDataUrl;
     String mVirtualUrlForDataUrl;
     boolean mCanLoadLocalResources;
+    boolean mIsRendererInitiated;
 
     /**
      * Creates an instance with default page transition type.
@@ -359,6 +360,20 @@ public class LoadUrlParams {
         return mLoadUrlType;
     }
 
+    /**
+     * @param rendererInitiated Whether or not this load was initiated from a renderer.
+     */
+    public void setIsRendererInitiated(boolean rendererInitiated) {
+        mIsRendererInitiated = rendererInitiated;
+    }
+
+    /**
+     * @return Whether or not this load was initiated from a renderer or not.
+     */
+    public boolean getIsRendererInitiated() {
+        return mIsRendererInitiated;
+    }
+
     public boolean isBaseUrlDataScheme() {
         // If there's no base url set, but this is a data load then
         // treat the scheme as data:.