Use LoadURLWithParams in ChromeWebContentsDelegateAndroid

components/web_contents_delegate_android/web_contents_delegate_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 "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "components/web_contents_delegate_android/color_chooser_android.h"
 #include "components/web_contents_delegate_android/validation_message_bubble_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/color_chooser.h"
+#include "content/public/browser/global_request_id.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/native_web_keyboard_event.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "jni/WebContentsDelegateAndroid_jni.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
@@ skipping 32 matching lines @@
 }
 
 // OpenURLFromTab() will be called when we're performing a browser-intiated
 // navigation. The most common scenario for this is opening new tabs (see
 // RenderViewImpl::decidePolicyForNavigation for more details).
 WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
     WebContents* source,
     const content::OpenURLParams& params) {
   const GURL& url = params.url;
   WindowOpenDisposition disposition = params.disposition;
-  content::PageTransition transition(
-      PageTransitionFromInt(params.transition));
 
   if (!source || (disposition != CURRENT_TAB &&
                   disposition != NEW_FOREGROUND_TAB &&
                   disposition != NEW_BACKGROUND_TAB &&
                   disposition != OFF_THE_RECORD)) {
     NOTIMPLEMENTED();
     return NULL;
   }
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 20 matching lines @@
     }
     Java_WebContentsDelegateAndroid_openNewTab(env,
                                                obj.obj(),
                                                java_url.obj(),
                                                extra_headers.obj(),
                                                post_data.obj(),
                                                disposition);
     return NULL;
   }
 
-  source->GetController().LoadURL(url, params.referrer, transition,
-                                  std::string());
+  content::NavigationController::LoadURLParams load_params(url);
+  load_params.referrer = params.referrer;
+  load_params.frame_tree_node_id = params.frame_tree_node_id;
+  load_params.redirect_chain = params.redirect_chain;
+  load_params.transition_type = params.transition;
+  load_params.extra_headers = params.extra_headers;
+  load_params.should_replace_current_entry =
+      params.should_replace_current_entry;
+  load_params.is_renderer_initiated = params.is_renderer_initiated;
+
+  if (params.transferred_global_request_id != content::GlobalRequestID()) {
+    load_params.transferred_global_request_id =
+        params.transferred_global_request_id;
+  }
+
+  // Only allows the browser-initiated navigation to use POST.
+  if (params.uses_post && !params.is_renderer_initiated) {
+    load_params.load_type =
+        content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
+    load_params.browser_initiated_post_data =
+        params.browser_initiated_post_data;
+  }
+
+  source->GetController().LoadURLWithParams(load_params);

[Charlie Reis, 2014/05/07 22:08:12]

I'm guessing this is just a misnomer, but LoadURLInContents operates on the
target WebContents and not the source (e.g., in cases that a navigation opens in
a new tab).  Are we using the correct WebContents here?

[David Trainor- moved to gerrit, 2014/05/07 22:43:54]

I can change it but I think we can only reach this if the disposition is
CURRENT_TAB.  I don't know if that means the web contents are the same or not. 
I can check/change this though.

[Charlie Reis, 2014/05/07 23:16:24]

Hmm, that's a good point: we don't use any of this code in the new tab cases. 
Won't that make a spoof possible on renderer-initiated loads in new tabs?

[David Trainor- moved to gerrit, 2014/05/12 20:52:45]

Yeah I'm looking into fixing that as well.  It requires some upstream/downstream
changes so I'll have to have a 2-stage patch to fix it.  I'll update this one
with that fix.

+
   return source;
 }
 
 void WebContentsDelegateAndroid::NavigationStateChanged(
     const WebContents* source, unsigned changed_flags) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
   Java_WebContentsDelegateAndroid_navigationStateChanged(
@@ skipping 224 matching lines @@
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // Register native methods
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android