predictors: Refactor the prefetcher in resource_prefetch_predictor.

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 17 matching lines @@
 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,
-                         std::unique_ptr<RequestVector> requests)
-      : ResourcePrefetcher(delegate,
-                           config,
-                           navigation_id,
-                           key_type,
-                           std::move(requests)) {}
+                         const std::vector<GURL>& urls)
+      : ResourcePrefetcher(delegate, config, navigation_id, key_type, 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, Request::PREFETCH_STATUS_FROM_CACHE);
+    FinishRequest(request);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestResourcePrefetcher);
 };
 
 
 // Delegate for ResourcePrefetcher.
 class TestResourcePrefetcherDelegate : public ResourcePrefetcher::Delegate {
  public:
   explicit TestResourcePrefetcherDelegate(base::MessageLoop* loop)
       : request_context_getter_(
             new net::TestURLRequestContextGetter(loop->task_runner())) {}
   ~TestResourcePrefetcherDelegate() { }
 
   net::URLRequestContext* GetURLRequestContext() override {
     return request_context_getter_->GetURLRequestContext();
   }
 
-  MOCK_METHOD2(ResourcePrefetcherFinished,
-               void(ResourcePrefetcher* prefetcher,
-                    ResourcePrefetcher::RequestVector* requests));
+  MOCK_METHOD1(ResourcePrefetcherFinished,
+               void(ResourcePrefetcher* prefetcher));
 
  private:
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(TestResourcePrefetcherDelegate);
 };
 
 
 // The following unittest tests most of the ResourcePrefetcher except for:
 // 1. Call to ReadFullResponse. There does not seem to be a good way to test the
 //    function in a unittest, and probably requires a browser_test.
 // 2. Setting of the Prefetch status for cache vs non cache.
 class ResourcePrefetcherTest : public testing::Test {
  public:
   ResourcePrefetcherTest();
   ~ResourcePrefetcherTest() override;
 
  protected:
-  typedef ResourcePrefetcher::Request Request;
-
   void AddStartUrlRequestExpectation(const std::string& url) {
     EXPECT_CALL(*prefetcher_,
                 StartURLRequest(Property(&net::URLRequest::original_url,
                                          Eq(GURL(url)))));
   }
 
   void CheckPrefetcherState(size_t inflight, size_t queue, size_t host) {
     EXPECT_EQ(prefetcher_->inflight_requests_.size(), inflight);
     EXPECT_EQ(prefetcher_->request_queue_.size(), queue);
     EXPECT_EQ(prefetcher_->host_inflight_counts_.size(), host);
   }
 
   net::URLRequest* GetInFlightRequest(const std::string& url_str) {
     GURL url(url_str);
 
-    for (auto* request : prefetcher_->request_queue_) {
-      EXPECT_NE(request->resource_url, url);
+    for (const auto& queued_url : prefetcher_->request_queue_) {
+      EXPECT_NE(queued_url, url);
     }
     for (const auto& key_value : prefetcher_->inflight_requests_) {
       if (key_value.first->original_url() == url)
         return key_value.first;
     }
     EXPECT_TRUE(false) << "In flight request not found: " << url_str;
     return NULL;
   }
 
 
@@ skipping 30 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) {
-  std::unique_ptr<ResourcePrefetcher::RequestVector> requests(
-      new ResourcePrefetcher::RequestVector);
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://www.google.com/resource1.html")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://www.google.com/resource2.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource1.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource2.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource3.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://m.google.com/resource1.jpg")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://www.google.com/resource3.html")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://m.google.com/resource2.html")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://m.google.com/resource3.css")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://m.google.com/resource4.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource4.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource5.png")));
+  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"));
 
-  // Needed later for comparison.
-  ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
-
-  prefetcher_.reset(
-      new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
-                                 PREFETCH_KEY_TYPE_URL, std::move(requests)));
+  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
+                                               navigation_id,
+                                               PREFETCH_KEY_TYPE_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 33 matching lines @@
   CheckPrefetcherState(3, 0, 2);
 
   OnCertificateRequested("http://m.google.com/resource4.png");
   CheckPrefetcherState(2, 0, 2);
 
   OnAuthRequired("http://m.google.com/resource3.css");
   CheckPrefetcherState(1, 0, 1);
 
   // Expect the final call.
   EXPECT_CALL(prefetcher_delegate_,
-              ResourcePrefetcherFinished(Eq(prefetcher_.get()),
-                                         Eq(requests_ptr)));
+              ResourcePrefetcherFinished(Eq(prefetcher_.get())));
 
   OnResponse("http://yahoo.com/resource3.png");
   CheckPrefetcherState(0, 0, 0);
-
-  // Check the prefetch status.
-  EXPECT_EQ(Request::PREFETCH_STATUS_CERT_ERROR,
-            (*requests_ptr)[0]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[1]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[2]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_REDIRECTED,
-            (*requests_ptr)[3]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[4]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[5]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_REDIRECTED,
-            (*requests_ptr)[6]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[7]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_AUTH_REQUIRED,
-            (*requests_ptr)[8]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_CERT_REQUIRED,
-            (*requests_ptr)[9]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[10]->prefetch_status);
-  EXPECT_EQ(Request::PREFETCH_STATUS_FROM_CACHE,
-            (*requests_ptr)[11]->prefetch_status);
-
-  // We need to delete requests_ptr here, though it looks to be managed by the
-  // scoped_ptr requests. The scoped_ptr requests releases itself and the raw
-  // pointer requests_ptr is passed to ResourcePrefetcherFinished(). In the
-  // test, ResourcePrefetcherFinished() is a mock function and does not handle
-  // the raw pointer properly. In the real code, requests_ptr will eventually be
-  // passed to and managed by ResourcePrefetchPredictor::Result::Result.
-  delete requests_ptr;
 }
 
 TEST_F(ResourcePrefetcherTest, TestPrefetcherStopped) {
-  std::unique_ptr<ResourcePrefetcher::RequestVector> requests(
-      new ResourcePrefetcher::RequestVector);
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://www.google.com/resource1.html")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://www.google.com/resource2.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource1.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource2.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://yahoo.com/resource3.png")));
-  requests->push_back(new ResourcePrefetcher::Request(GURL(
-      "http://m.google.com/resource1.jpg")));
+  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"));
 
-  // Needed later for comparison.
-  ResourcePrefetcher::RequestVector* requests_ptr = requests.get();
-
-  prefetcher_.reset(
-      new TestResourcePrefetcher(&prefetcher_delegate_, config_, navigation_id,
-                                 PREFETCH_KEY_TYPE_HOST, std::move(requests)));
+  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
+                                               navigation_id,
+                                               PREFETCH_KEY_TYPE_HOST, 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);
 
   OnResponse("http://www.google.com/resource1.html");
   CheckPrefetcherState(4, 1, 3);
 
   prefetcher_->Stop();  // No more queueing.
 
   OnResponse("http://www.google.com/resource2.png");
   CheckPrefetcherState(3, 1, 2);
 
   OnResponse("http://yahoo.com/resource1.png");
   CheckPrefetcherState(2, 1, 2);
 
   OnResponse("http://yahoo.com/resource2.png");
   CheckPrefetcherState(1, 1, 1);
 
   // Expect the final call.
   EXPECT_CALL(prefetcher_delegate_,
-              ResourcePrefetcherFinished(Eq(prefetcher_.get()),
-                                         Eq(requests_ptr)));
+              ResourcePrefetcherFinished(Eq(prefetcher_.get())));
 
   OnResponse("http://m.google.com/resource1.jpg");
   CheckPrefetcherState(0, 1, 0);
-
-  // We need to delete requests_ptr here, though it looks to be managed by the
-  // scoped_ptr requests. The scoped_ptr requests releases itself and the raw
-  // pointer requests_ptr is passed to ResourcePrefetcherFinished(). In the
-  // test, ResourcePrefetcherFinished() is a mock function and does not handle
-  // the raw pointer properly. In the real code, requests_ptr will eventually be
-  // passed to and managed by ResourcePrefetchPredictor::Result::Result.
-  delete requests_ptr;
 }
 
 }  // namespace predictors