Various Prerender Service / Prerender LocalPredictor related changes.

chrome/browser/prerender/prerender_local_predictor.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 163 matching lines @@
   void OnLookupURL(scoped_ptr<CandidatePrerenderInfo> info);
 
   // Lookup the prerender candidate in the Prerender Service (if applicable).
   void DoPrerenderServiceCheck(scoped_ptr<CandidatePrerenderInfo> info);
 
   // Lookup the prerender candidate in the LoggedIn Predictor.
   void DoLoggedInLookup(scoped_ptr<CandidatePrerenderInfo> info);
 
   // Returns an element of issued_prerenders_, which should be replaced
   // by a new prerender of the priority indicated, or NULL, if the priority
-  // is too low.
-  PrerenderProperties* GetIssuedPrerenderSlotForPriority(double priority);
+  // is too low (or if the URL requested is already prerendering).
+  PrerenderProperties* GetIssuedPrerenderSlotForPriority(const GURL& url,
+                                                         double priority);
 
   void ContinuePrerenderCheck(scoped_ptr<CandidatePrerenderInfo> info);
   void LogCandidateURLStats(const GURL& url) const;
-  void IssuePrerender(scoped_ptr<CandidatePrerenderInfo> info,
-                      scoped_ptr<LocalPredictorURLInfo> url_info,
+  void IssuePrerender(CandidatePrerenderInfo* info,
+                      LocalPredictorURLInfo* url_info,
                       PrerenderProperties* prerender_properties);
   void MaybeCancelURLFetcher(net::URLFetcher* fetcher);
   // Returns true if the parsed response is semantically correct and could
   // be fully applied.
   bool ApplyParsedPrerenderServiceResponse(
       base::DictionaryValue* dict,
       CandidatePrerenderInfo* info,
       bool* hinting_timed_out,
       bool* hinting_url_lookup_timed_out,
       bool* candidate_url_lookup_timed_out);
@@ skipping 25 matching lines @@
   base::hash_set<int64> url_whitelist_;
 
   base::WeakPtrFactory<PrerenderLocalPredictor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderLocalPredictor);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_