predictors: Key the resource prefetcher by URL, not navigation.

chrome/browser/predictors/resource_prefetcher.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.h"
 
 #include <iterator>
 #include <utility>
 
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request_context.h"
 #include "url/origin.h"
 
 namespace {
 
 // The size of the buffer used to read the resource.
 static const size_t kResourceBufferSizeBytes = 50000;
 
 }  // namespace
 
 namespace predictors {
 ResourcePrefetcher::ResourcePrefetcher(
     Delegate* delegate,
     const ResourcePrefetchPredictorConfig& config,
-    const NavigationID& navigation_id,
-    PrefetchKeyType key_type,
+    const GURL& main_frame_url,
     const std::vector<GURL>& urls)
     : state_(INITIALIZED),
       delegate_(delegate),
       config_(config),
-      navigation_id_(navigation_id),
-      key_type_(key_type) {
+      main_frame_url_(main_frame_url) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   std::copy(urls.begin(), urls.end(), std::back_inserter(request_queue_));
 }
 
 ResourcePrefetcher::~ResourcePrefetcher() {}
 
 void ResourcePrefetcher::Start() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 55 matching lines @@
     delegate_->ResourcePrefetcherFinished(this);
   }
 }
 
 void ResourcePrefetcher::SendRequest(const GURL& url) {
   std::unique_ptr<net::URLRequest> url_request =
       delegate_->GetURLRequestContext()->CreateRequest(url, net::LOW, this);
   host_inflight_counts_[url.host()] += 1;
 
   url_request->set_method("GET");
-  url_request->set_first_party_for_cookies(navigation_id_.main_frame_url);
-  url_request->set_initiator(url::Origin(navigation_id_.main_frame_url));
-  url_request->SetReferrer(navigation_id_.main_frame_url.spec());
+  url_request->set_first_party_for_cookies(main_frame_url_);
+  url_request->set_initiator(url::Origin(main_frame_url_));
+  url_request->SetReferrer(main_frame_url_.spec());
   url_request->SetLoadFlags(url_request->load_flags() | net::LOAD_PREFETCH);
   StartURLRequest(url_request.get());
   inflight_requests_.insert(
       std::make_pair(url_request.get(), std::move(url_request)));
 }
 
 void ResourcePrefetcher::StartURLRequest(net::URLRequest* request) {
   request->Start();
 }
 
@@ skipping 81 matching lines @@
   if (!request->status().is_success()) {
     FinishRequest(request);
     return;
   }
 
   if (ShouldContinueReadingRequest(request, bytes_read))
     ReadFullResponse(request);
 }
 
 }  // namespace predictors