predictors: Refactor the prefetcher in resource_prefetch_predictor.

chrome/browser/predictors/resource_prefetcher_manager.cc

 // Copyright 2014 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/predictors/resource_prefetcher_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 35 matching lines @@
 
 void ResourcePrefetcherManager::ShutdownOnIOThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   base::STLDeleteContainerPairSecondPointers(prefetcher_map_.begin(),
                                              prefetcher_map_.end());
 }
 
 void ResourcePrefetcherManager::MaybeAddPrefetch(
     const NavigationID& navigation_id,
     PrefetchKeyType key_type,
-    std::unique_ptr<ResourcePrefetcher::RequestVector> requests) {
+    const std::vector<GURL>& urls) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Don't add a duplicate prefetch for the same host or URL.
   std::string key = key_type == PREFETCH_KEY_TYPE_HOST ?
       navigation_id.main_frame_url.host() : navigation_id.main_frame_url.spec();
   if (base::ContainsKey(prefetcher_map_, key))
     return;
 
-  ResourcePrefetcher* prefetcher = new ResourcePrefetcher(
-      this, config_, navigation_id, key_type, std::move(requests));
+  ResourcePrefetcher* prefetcher =
+      new ResourcePrefetcher(this, config_, navigation_id, key_type, urls);
   prefetcher_map_.insert(std::make_pair(key, prefetcher));
   prefetcher->Start();
 }
 
 void ResourcePrefetcherManager::MaybeRemovePrefetch(
     const NavigationID& navigation_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Look for a URL based prefetch first.
   PrefetcherMap::iterator it = prefetcher_map_.find(
       navigation_id.main_frame_url.spec());
   if (it != prefetcher_map_.end() &&
       it->second->navigation_id() == navigation_id) {
     it->second->Stop();
     return;
   }
 
   // No URL based prefetching, look for host based.
   it = prefetcher_map_.find(navigation_id.main_frame_url.host());
   if (it != prefetcher_map_.end() &&
       it->second->navigation_id() == navigation_id) {
     it->second->Stop();
   }
 }
 
 void ResourcePrefetcherManager::ResourcePrefetcherFinished(
-    ResourcePrefetcher* resource_prefetcher,
-    ResourcePrefetcher::RequestVector* requests) {
+    ResourcePrefetcher* resource_prefetcher) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  // |predictor_| can only be accessed from the UI thread.
-  std::unique_ptr<ResourcePrefetcher::RequestVector> scoped_requests(requests);
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(&ResourcePrefetcherManager::ResourcePrefetcherFinishedOnUI,
-                 this,
-                 resource_prefetcher->navigation_id(),
-                 resource_prefetcher->key_type(),
-                 base::Passed(&scoped_requests)));
-
   const GURL& main_frame_url =
       resource_prefetcher->navigation_id().main_frame_url;
   const std::string key =
       resource_prefetcher->key_type() == PREFETCH_KEY_TYPE_HOST ?
           main_frame_url.host() : main_frame_url.spec();
   PrefetcherMap::iterator it = prefetcher_map_.find(key);
   DCHECK(it != prefetcher_map_.end());
   delete it->second;
   prefetcher_map_.erase(it);
 }
 
-void ResourcePrefetcherManager::ResourcePrefetcherFinishedOnUI(
-    const NavigationID& navigation_id,
-    PrefetchKeyType key_type,
-    std::unique_ptr<ResourcePrefetcher::RequestVector> requests) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  // |predictor_| may have been set to NULL if the predictor is shutting down.
-  if (predictor_) {
-    predictor_->FinishedPrefetchForNavigation(navigation_id,
-                                              key_type,
-                                              requests.release());
-  }
-}
-
 net::URLRequestContext* ResourcePrefetcherManager::GetURLRequestContext() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   return context_getter_->GetURLRequestContext();
 }
 
 }  // namespace predictors