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

chrome/browser/predictors/resource_prefetcher_unittest.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 <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 15 matching lines @@
 using testing::Property;
 
 namespace predictors {
 
 // Wrapper over the ResourcePrefetcher that stubs out the StartURLRequest call
 // since we do not want to do network fetches in this unittest.
 class TestResourcePrefetcher : public ResourcePrefetcher {
  public:
   TestResourcePrefetcher(ResourcePrefetcher::Delegate* delegate,
                          const ResourcePrefetchPredictorConfig& config,
-                         const NavigationID& navigation_id,
-                         PrefetchKeyType key_type,
+                         const GURL& main_frame_url,
                          const std::vector<GURL>& urls)
-      : ResourcePrefetcher(delegate, config, navigation_id, key_type, urls) {}
+      : ResourcePrefetcher(delegate, config, main_frame_url, urls) {}
 
   ~TestResourcePrefetcher() override {}
 
   MOCK_METHOD1(StartURLRequest, void(net::URLRequest* request));
 
   void ReadFullResponse(net::URLRequest* request) override {
     EXPECT_TRUE(request->load_flags() & net::LOAD_PREFETCH);
     FinishRequest(request);
   }
 
@@ skipping 94 matching lines @@
       io_thread_(content::BrowserThread::IO, &loop_),
       prefetcher_delegate_(&loop_) {
   config_.max_prefetches_inflight_per_navigation = 5;
   config_.max_prefetches_inflight_per_host_per_navigation = 2;
 }
 
 ResourcePrefetcherTest::~ResourcePrefetcherTest() {
 }
 
 TEST_F(ResourcePrefetcherTest, TestPrefetcherFinishes) {
+  GURL main_frame_url("http://www.google.com");
   std::vector<GURL> urls = {GURL("http://www.google.com/resource1.html"),
                             GURL("http://www.google.com/resource2.png"),
                             GURL("http://yahoo.com/resource1.png"),
                             GURL("http://yahoo.com/resource2.png"),
                             GURL("http://yahoo.com/resource3.png"),
                             GURL("http://m.google.com/resource1.jpg"),
                             GURL("http://www.google.com/resource3.html"),
                             GURL("http://m.google.com/resource2.html"),
                             GURL("http://m.google.com/resource3.css"),
                             GURL("http://m.google.com/resource4.png"),
                             GURL("http://yahoo.com/resource4.png"),
                             GURL("http://yahoo.com/resource5.png")};
 
-  NavigationID navigation_id(1, 2, GURL("http://www.google.com"));
+  NavigationID navigation_id(1, 2, main_frame_url);
 
   prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
-                                               navigation_id,
-                                               PREFETCH_KEY_TYPE_URL, urls));
+                                               main_frame_url, urls));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
   AddStartUrlRequestExpectation("http://www.google.com/resource2.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource1.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource2.png");
   AddStartUrlRequestExpectation("http://m.google.com/resource1.jpg");
 
   prefetcher_->Start();
   CheckPrefetcherState(5, 7, 3);
@@ skipping 40 matching lines @@
 
   // Expect the final call.
   EXPECT_CALL(prefetcher_delegate_,
               ResourcePrefetcherFinished(Eq(prefetcher_.get())));
 
   OnResponse("http://yahoo.com/resource3.png");
   CheckPrefetcherState(0, 0, 0);
 }
 
 TEST_F(ResourcePrefetcherTest, TestPrefetcherStopped) {
+  GURL main_frame_url("http://www.google.com");
   std::vector<GURL> urls = {GURL("http://www.google.com/resource1.html"),
                             GURL("http://www.google.com/resource2.png"),
                             GURL("http://yahoo.com/resource1.png"),
                             GURL("http://yahoo.com/resource2.png"),
                             GURL("http://yahoo.com/resource3.png"),
                             GURL("http://m.google.com/resource1.jpg")};
 
-  NavigationID navigation_id(1, 2, GURL("http://www.google.com"));
+  NavigationID navigation_id(1, 2, main_frame_url);
 
   prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
-                                               navigation_id,
-                                               PREFETCH_KEY_TYPE_HOST, urls));
+                                               main_frame_url, urls));
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.html");
   AddStartUrlRequestExpectation("http://www.google.com/resource2.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource1.png");
   AddStartUrlRequestExpectation("http://yahoo.com/resource2.png");
   AddStartUrlRequestExpectation("http://m.google.com/resource1.jpg");
 
   prefetcher_->Start();
   CheckPrefetcherState(5, 1, 3);
@@ skipping 14 matching lines @@
 
   // Expect the final call.
   EXPECT_CALL(prefetcher_delegate_,
               ResourcePrefetcherFinished(Eq(prefetcher_.get())));
 
   OnResponse("http://m.google.com/resource1.jpg");
   CheckPrefetcherState(0, 1, 0);
 }
 
 }  // namespace predictors