Add support for content::Referrer to prerender

chrome/browser/prerender/prerender_manager.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_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 299 matching lines @@
 void PrerenderManager::Shutdown() {
   DoShutdown();
 }
 
 void PrerenderManager::SetPrerenderContentsFactory(
     PrerenderContents::Factory* prerender_contents_factory) {
   DCHECK(CalledOnValidThread());
   prerender_contents_factory_.reset(prerender_contents_factory);
 }
 
-bool PrerenderManager::AddPrerenderFromLinkRelPrerender(int process_id,
-                                                        int route_id,
-                                                        const GURL& url,
-                                                        const GURL& referrer) {
+bool PrerenderManager::AddPrerenderFromLinkRelPrerender(
+    int process_id,
+    int route_id,
+    const GURL& url,
+    const content::Referrer& referrer) {
   std::pair<int, int> child_route_id_pair = std::make_pair(process_id,
                                                            route_id);
 
   return AddPrerender(ORIGIN_LINK_REL_PRERENDER, child_route_id_pair,
                       url, referrer, NULL);
 }
 
 bool PrerenderManager::AddPrerenderFromOmnibox(
     const GURL& url,
     SessionStorageNamespace* session_storage_namespace) {
   DCHECK(session_storage_namespace);
   if (!IsOmniboxEnabled(profile_))
     return false;
 
   Origin origin = ORIGIN_MAX;
   switch (GetOmniboxHeuristicToUse()) {
     case OMNIBOX_HEURISTIC_EXACT:
       origin = ORIGIN_OMNIBOX_EXACT;
       break;
 
     case OMNIBOX_HEURISTIC_EXACT_FULL:
       origin = ORIGIN_OMNIBOX_EXACT_FULL;
       break;
 
     default:
       NOTREACHED();
       break;
   };
-  return AddPrerender(origin, std::make_pair(-1, -1), url, GURL(),
+  return AddPrerender(origin, std::make_pair(-1, -1), url, content::Referrer(),
                       session_storage_namespace);
 }
 
 bool PrerenderManager::AddPrerender(
     Origin origin,
     const std::pair<int, int>& child_route_id_pair,
     const GURL& url_arg,
-    const GURL& referrer,
+    const content::Referrer& referrer,
     SessionStorageNamespace* session_storage_namespace) {
   DCHECK(CalledOnValidThread());
 
-  if (origin == ORIGIN_LINK_REL_PRERENDER && IsGoogleSearchResultURL(referrer))
+  if (origin == ORIGIN_LINK_REL_PRERENDER &&
+      IsGoogleSearchResultURL(referrer.url)) {
     origin = ORIGIN_GWS_PRERENDER;
+  }
 
   // If the referring page is prerendering, defer the prerender.
   std::list<PrerenderContentsData>::iterator source_prerender =
       FindPrerenderContentsForChildRouteIdPair(child_route_id_pair);
   if (source_prerender != prerender_list_.end()) {
     source_prerender->contents_->AddPendingPrerender(
         origin, url_arg, referrer);
     return true;
   }
 
@@ skipping 387 matching lines @@
 }
 
 bool PrerenderManager::IsPrerenderElementFresh(const base::Time start) const {
   DCHECK(CalledOnValidThread());
   base::Time now = GetCurrentTime();
   return (now - start < config_.max_age);
 }
 
 PrerenderContents* PrerenderManager::CreatePrerenderContents(
     const GURL& url,
-    const GURL& referrer,
+    const content::Refeerrer& referrer,

[cbentzel, 2011/12/05 18:03:29]

BUG: Referrer

[jochen (gone - plz use gerrit), 2011/12/05 20:46:35]

Done.

     Origin origin,
     uint8 experiment_id) {
   DCHECK(CalledOnValidThread());
   return prerender_contents_factory_->CreatePrerenderContents(
       this, prerender_tracker_, profile_, url,
       referrer, origin, experiment_id);
 }
 
 bool PrerenderManager::IsPendingDelete(PrerenderContents* entry) const {
   DCHECK(CalledOnValidThread());
@@ skipping 358 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender