Consolidate all NavigationController::LoadURL and family functions

chrome/browser/ui/browser_navigator.cc

Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index dc1134cb5b657ea341b540aec1d29382bab8e844..4464de0e120792f958b220de79b14e6d048c74ba 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -218,25 +218,17 @@ void LoadURLInContents(WebContents* target_contents,
                        const GURL& url,
                        chrome::NavigateParams* params,
                        const std::string& extra_headers) {
+  content::NavigationController::LoadURLParams load_url_params(url);
+  load_url_params.referrer = params->referrer;
+  load_url_params.transition_type = params->transition;
+  load_url_params.extra_headers = extra_headers;
   if (params->transferred_global_request_id != GlobalRequestID()) {
-    target_contents->GetController().TransferURL(
-        url,
-        params->referrer,
-        params->transition, extra_headers,
-        params->transferred_global_request_id,
-        params->is_renderer_initiated);

[Charlie Reis, 2012/08/03 21:28:36]

You've lost params->is_renderer_initiated in this case.

[boliu, 2012/08/03 22:42:08]

Very good catch! Fixed.

+    load_url_params.transferred_global_request_id =
+        params->transferred_global_request_id;
   } else if (params->is_renderer_initiated) {
-    target_contents->GetController().LoadURLFromRenderer(
-        url,
-        params->referrer,
-        params->transition,  extra_headers);
-  } else {
-    target_contents->GetController().LoadURL(
-        url,
-        params->referrer,
-        params->transition,  extra_headers);
+    load_url_params.is_renderer_initiated = true;
   }
-
+  target_contents->GetController().LoadURLWithParams(load_url_params);
 }
 
 // This class makes sure the Browser object held in |params| is made visible