Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..."

chrome/browser/android/tab_android.cc

 // Copyright (c) 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 "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
@@ skipping 357 matching lines @@
   return profile_android->GetJavaObject();
 }
 
 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(JNIEnv* env,
                                               jobject obj,
                                               jstring url,
                                               jstring j_extra_headers,
                                               jbyteArray j_post_data,
                                               jint page_transition,
                                               jstring j_referrer_url,
-                                              jint referrer_policy) {
+                                              jint referrer_policy,
+                                              jboolean is_renderer_initiated) {
   content::ContentViewCore* content_view = GetContentViewCore();
   if (!content_view)
     return PAGE_LOAD_FAILED;
 
   GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
   if (gurl.is_empty())
     return PAGE_LOAD_FAILED;
 
   // If the page was prerendered, use it.
   // Note in incognito mode, we don't have a PrerenderManager.
@@ skipping 56 matching lines @@
     }
     const base::string16 search_terms =
         chrome::ExtractSearchTermsFromURL(GetProfile(), gurl);
     SearchTabHelper* search_tab_helper =
         SearchTabHelper::FromWebContents(web_contents_.get());
     if (!search_terms.empty() && search_tab_helper &&
         search_tab_helper->SupportsInstant()) {
       search_tab_helper->Submit(search_terms);
       return DEFAULT_PAGE_LOAD;
     }
+    load_params.is_renderer_initiated = is_renderer_initiated;
     content_view->LoadUrl(load_params);
   }
   return DEFAULT_PAGE_LOAD;
 }
 
 ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel(JNIEnv* env,
                                                          jobject obj) {
   return ToolbarModelImpl::GetSecurityLevelForWebContents(web_contents());
 }
 
@@ skipping 40 matching lines @@
 
 static void Init(JNIEnv* env, jobject obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }