Make NavigationEntry and friends use content::Referrer instead of plain URLs

content/browser/tab_contents/navigation_controller.cc

 // Copyright (c) 2011 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/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"  // Temporary
 #include "base/string_util.h"
@@ skipping 205 matching lines @@
     pending_reload_ = NO_RELOAD;
   }
 }
 
 bool NavigationController::IsInitialNavigation() {
   return last_document_loaded_.is_null();
 }
 
 // static
 NavigationEntry* NavigationController::CreateNavigationEntry(
-    const GURL& url, const GURL& referrer, content::PageTransition transition,
+    const GURL& url, const content::Referrer& referrer,
+    content::PageTransition transition,
     bool is_renderer_initiated, const std::string& extra_headers,
     content::BrowserContext* browser_context) {
   // Allow the browser URL handler to rewrite the URL. This will, for example,
   // remove "view-source:" from the beginning of the URL to get the URL that
   // will actually be loaded. This real URL won't be shown to the user, just
   // used internally.
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
   BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &loaded_url, browser_context, &reverse_on_redirect);
@@ skipping 264 matching lines @@
 void NavigationController::TransferURL(
     const GURL& url,
     const content::Referrer& referrer,
     content::PageTransition transition,
     const std::string& extra_headers,
     const GlobalRequestID& transferred_global_request_id,
     bool is_renderer_initiated) {
   // The user initiated a load, we don't need to reload anymore.
   needs_reload_ = false;
 
-  NavigationEntry* entry = CreateNavigationEntry(url, referrer.url, transition,
+  NavigationEntry* entry = CreateNavigationEntry(url, referrer, transition,
                                                  is_renderer_initiated,
                                                  extra_headers,
                                                  browser_context_);
   entry->set_transferred_global_request_id(transferred_global_request_id);
 
   LoadEntry(entry);
 }
 
 void NavigationController::LoadURL(
     const GURL& url,
     const content::Referrer& referrer,
     content::PageTransition transition,
     const std::string& extra_headers) {
   // The user initiated a load, we don't need to reload anymore.
   needs_reload_ = false;
 
-  NavigationEntry* entry = CreateNavigationEntry(url, referrer.url, transition,
+  NavigationEntry* entry = CreateNavigationEntry(url, referrer, transition,
                                                  false,
                                                  extra_headers,
                                                  browser_context_);
 
   LoadEntry(entry);
 }
 
 void NavigationController::LoadURLFromRenderer(
     const GURL& url,
     const content::Referrer& referrer,
     content::PageTransition transition,
     const std::string& extra_headers) {
   // The user initiated a load, we don't need to reload anymore.
   needs_reload_ = false;
 
-  NavigationEntry* entry = CreateNavigationEntry(url, referrer.url, transition,
+  NavigationEntry* entry = CreateNavigationEntry(url, referrer, transition,
                                                  true,
                                                  extra_headers,
                                                  browser_context_);
 
   LoadEntry(entry);
 }
 
 void NavigationController::DocumentLoadedInFrame() {
   last_document_loaded_ = base::TimeTicks::Now();
 }
@@ skipping 241 matching lines @@
     // When navigating to a new page, give the browser URL handler a chance to
     // update the virtual URL based on the new URL. For example, this is needed
     // to show chrome://bookmarks/#1 when the bookmarks webui extension changes
     // the URL.
     update_virtual_url = true;
   }
 
   new_entry->set_url(params.url);
   if (update_virtual_url)
     UpdateVirtualURLToURL(new_entry, params.url);
-  new_entry->set_referrer(params.referrer.url);
+  new_entry->set_referrer(params.referrer);
   new_entry->set_page_id(params.page_id);
   new_entry->set_transition_type(params.transition);
   new_entry->set_site_instance(tab_contents_->GetSiteInstance());
   new_entry->set_has_post_data(params.is_post);
 
   InsertOrReplaceEntry(new_entry, *did_replace_entry);
 }
 
 void NavigationController::RendererDidNavigateToExistingPage(
     const ViewHostMsg_FrameNavigate_Params& params) {
@@ skipping 465 matching lines @@
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
     if (source.entries_[i].get()->page_type() !=
         content::PAGE_TYPE_INTERSTITIAL) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntry>(
                           new NavigationEntry(*source.entries_[i])));
     }
   }
 }