Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..."

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 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/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 889 matching lines @@
     jstring url,
     jint load_url_type,
     jint transition_type,
     jstring j_referrer_url,
     jint referrer_policy,
     jint ua_override_option,
     jstring extra_headers,
     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)));
 
   params.load_type = static_cast<NavigationController::LoadURLType>(
       load_url_type);
   params.transition_type = PageTransitionFromInt(transition_type);
   params.override_user_agent =
       static_cast<NavigationController::UserAgentOverrideOption>(
           ua_override_option);
@@ skipping 18 matching lines @@
         GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url));
   }
 
   params.can_load_local_resources = can_load_local_resources;
   if (j_referrer_url) {
     params.referrer = content::Referrer(
         GURL(ConvertJavaStringToUTF8(env, j_referrer_url)),
         static_cast<blink::WebReferrerPolicy>(referrer_policy));
   }
 
+  params.is_renderer_initiated = is_renderer_initiated;
+
   LoadUrl(params);
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
     JNIEnv* env, jobject) const {
   return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
 }
 
 jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
   return GetWebContents()->GetBrowserContext()->IsOffTheRecord();
@@ skipping 720 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content