Add support for content::Referrer to prerender

chrome/browser/prerender/prerender_contents.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 "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 45 matching lines @@
   }
   GURL url_;
 };
 
 }  // end namespace
 
 class PrerenderContentsFactoryImpl : public PrerenderContents::Factory {
  public:
   virtual PrerenderContents* CreatePrerenderContents(
       PrerenderManager* prerender_manager, PrerenderTracker* prerender_tracker,
-      Profile* profile, const GURL& url, const GURL& referrer,
+      Profile* profile, const GURL& url, const content::Referrer& referrer,
       Origin origin, uint8 experiment_id) OVERRIDE {
     return new PrerenderContents(prerender_manager, prerender_tracker, profile,
                                  url, referrer, origin, experiment_id);
   }
 };
 
 PrerenderContents::PendingPrerenderData::PendingPrerenderData(
     Origin origin,
     const GURL& url,
-    const GURL& referrer)
+    const content::Referrer& referrer)
     : origin(origin),
       url(url),
       referrer(referrer) {
 }
 
 // TabContentsDelegateImpl -----------------------------------------------------
 
 class PrerenderContents::TabContentsDelegateImpl
     : public TabContentsDelegate {
  public:
@@ skipping 51 matching lines @@
       AddPageVector;
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   PrerenderContents* prerender_contents_;
 };
 
 void PrerenderContents::AddPendingPrerender(Origin origin,
                                             const GURL& url,
-                                            const GURL& referrer) {
+                                            const content::Referrer& referrer) {
   pending_prerender_list_.push_back(
       PendingPrerenderData(origin, url, referrer));
 }
 
 bool PrerenderContents::IsPendingEntry(const GURL& url) const {
   for (PendingPrerenderList::const_iterator it =
            pending_prerender_list_.begin();
        it != pending_prerender_list_.end();
        ++it) {
     if (it->url == url)
@@ skipping 14 matching lines @@
                                      it->referrer,
                                      NULL);
   }
 }
 
 PrerenderContents::PrerenderContents(
     PrerenderManager* prerender_manager,
     PrerenderTracker* prerender_tracker,
     Profile* profile,
     const GURL& url,
-    const GURL& referrer,
+    const content::Referrer& referrer,
     Origin origin,
     uint8 experiment_id)
     : prerender_manager_(prerender_manager),
       prerender_tracker_(prerender_tracker),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
       page_id_(0),
       has_stopped_loading_(false),
       final_status_(FINAL_STATUS_MAX),
@@ skipping 126 matching lines @@
       content::Source<TabContents>(new_contents));
 
   DCHECK(load_start_time_.is_null());
   load_start_time_ = base::TimeTicks::Now();
 
   content::PageTransition transition = content::PAGE_TRANSITION_LINK;
   if (origin_ == ORIGIN_OMNIBOX_EXACT || origin_ == ORIGIN_OMNIBOX_EXACT_FULL)
     transition = content::PAGE_TRANSITION_TYPED;
   new_contents->controller().LoadURL(
       prerender_url_,
-      content::Referrer(referrer_, WebKit::WebReferrerPolicyDefault),
+      referrer_,
       transition, std::string());
 }
 
 bool PrerenderContents::GetChildId(int* child_id) const {
   CHECK(child_id);
   DCHECK_GE(child_id_, -1);
   *child_id = child_id_;
   return child_id_ != -1;
 }
 
@@ skipping 335 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->tab_contents())
     return false;
   const TabContents* tab_contents = prerender_contents_->tab_contents();
   return (tab_contents->GetSiteInstance() !=
           tab_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender