Consolidate all NavigationController::LoadURL and family functions

chrome/browser/ui/browser_navigator.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/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 200 matching lines @@
   if (params->source_contents)
     return params->source_contents->profile();
 
   return source_browser->profile();
 }
 
 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
 // by the time it goes out of scope, provided |params| wants it to be shown.
 class ScopedBrowserDisplayer {
  public:
   explicit ScopedBrowserDisplayer(chrome::NavigateParams* params)
       : params_(params) {
   }
   ~ScopedBrowserDisplayer() {
@@ skipping 334 matching lines @@
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUISettingsFrameHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost ||
        url.host() == chrome::kChromeUIUberHost));
 }
 
 }  // namespace chrome