Separate same domain and cross domain <link rel=...> prerenders for reporting.

chrome/browser/prerender/prerender_manager.h

Index: chrome/browser/prerender/prerender_manager.h
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index b473e6920ddb87756582f69d58acc5332cb4540b..ede15169c0c740abcbd0450d7b18a605183dc69d 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -201,10 +201,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   void MarkWebContentsAsNotPrerendered(content::WebContents* web_contents);
 
   // Returns true if |web_contents| is being prerendered. The optional parameter
-  // |origin| is an output parameter which, if a prerender is found, is set to
-  // the Origin of the prerender of |web_contents|.
+  // |origin| is an output parameter which if passed non-null is set to point
+  // to the Origin of that prerender if one is found, NULL otherwise.
   bool IsWebContentsPrerendered(content::WebContents* web_contents,
-                                Origin* origin) const;
+                                const Origin** origin) const;

[dominich, 2012/10/08 17:03:04]

this can stay as Origin* and still be optional and NULLable.

[gavinp, 2012/10/08 17:09:36]

 Yes. Bad merge/rebase; I'll fix and reupload.

 
   bool WouldWebContentsBePrerendered(content::WebContents* web_contents) const;
 
@@ -502,10 +502,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // List of prerender elements to be deleted
   std::list<PrerenderContents*> pending_delete_list_;
 
-  // This map is from all WebContents which are currently displaying a
-  // prerendered page which has already been swapped in to a
-  // PrerenderedWebContentsData for tracking full lifetime information
-  // on prerenders.
+  // Set of WebContents which are currently displaying a prerendered page.
   base::hash_map<content::WebContents*, PrerenderedWebContentsData>
       prerendered_web_contents_data_;