predictors: Remove ResourcePrefetchPredictorConfig from ResourcePrefetcher.

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 <string>
@@ skipping 12 matching lines @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Eq;
 using testing::Property;
 
 namespace predictors {
 
+constexpr size_t kMaxConcurrentRequests = 5;
+constexpr size_t kMaxConcurrentRequestsPerHost = 2;
+
 // 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,
+                         size_t max_concurrent_requests,
+                         size_t max_concurrent_requests_per_host,
                          const GURL& main_frame_url,
                          const std::vector<GURL>& urls)
-      : ResourcePrefetcher(delegate, config, main_frame_url, urls) {}
+      : ResourcePrefetcher(delegate,
+                           max_concurrent_requests,
+                           max_concurrent_requests_per_host,
+                           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);
     RequestComplete(request);
     FinishRequest(request);
   }
@@ skipping 85 matching lines @@
   void OnSSLCertificateError(const std::string& url) {
     prefetcher_->OnSSLCertificateError(GetInFlightRequest(url),
                                        net::SSLInfo(), false);
   }
   void OnResponse(const std::string& url) {
     prefetcher_->OnResponseStarted(GetInFlightRequest(url), net::OK);
   }
 
   base::MessageLoop loop_;
   content::TestBrowserThread io_thread_;
-  ResourcePrefetchPredictorConfig config_;
   TestResourcePrefetcherDelegate prefetcher_delegate_;
   std::unique_ptr<TestResourcePrefetcher> prefetcher_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetcherTest);
 };
 
 ResourcePrefetcherTest::ResourcePrefetcherTest()
     : loop_(base::MessageLoop::TYPE_IO),
       io_thread_(content::BrowserThread::IO, &loop_),
-      prefetcher_delegate_(&loop_) {
-  config_.max_prefetches_inflight_per_host_per_navigation = 2;
-}
+      prefetcher_delegate_(&loop_) {}
 
 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")};
 
-  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
-                                               main_frame_url, urls));
+  prefetcher_ = base::MakeUnique<TestResourcePrefetcher>(
+      &prefetcher_delegate_, kMaxConcurrentRequests,
+      kMaxConcurrentRequestsPerHost, 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 48 matching lines @@
 
 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")};
 
-  prefetcher_.reset(new TestResourcePrefetcher(&prefetcher_delegate_, config_,
-                                               main_frame_url, urls));
+  prefetcher_ = base::MakeUnique<TestResourcePrefetcher>(
+      &prefetcher_delegate_, kMaxConcurrentRequests,
+      kMaxConcurrentRequestsPerHost, 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 24 matching lines @@
   base::HistogramTester histogram_tester;
   GURL main_frame_url("http://www.google.com");
   std::vector<GURL> urls = {GURL("http://www.google.com/resource1.png"),
                             GURL("http://www.google.com/resource2.png"),
                             GURL("http://www.google.com/resource3.png"),
                             GURL("http://www.google.com/resource4.png"),
                             GURL("http://www.google.com/resource5.png"),
                             GURL("http://www.google.com/resource6.png")};
 
   prefetcher_ = base::MakeUnique<TestResourcePrefetcher>(
-      &prefetcher_delegate_, config_, main_frame_url, urls);
+      &prefetcher_delegate_, kMaxConcurrentRequests,
+      kMaxConcurrentRequestsPerHost, main_frame_url, urls);
 
   // Starting the prefetcher maxes out the number of possible requests.
   AddStartUrlRequestExpectation("http://www.google.com/resource1.png");
   AddStartUrlRequestExpectation("http://www.google.com/resource2.png");
   AddStartUrlRequestExpectation("http://www.google.com/resource3.png");
 
   prefetcher_->Start();
 
   AddStartUrlRequestExpectation("http://www.google.com/resource4.png");
   OnResponse("http://www.google.com/resource1.png");
@@ skipping 27 matching lines @@
 }
 
 TEST_F(ResourcePrefetcherTest, TestReferrer) {
   std::string url = "https://www.notgoogle.com/cats.html";
   std::string https_resource = "https://www.google.com/resource1.png";
   std::string http_resource = "http://www.google.com/resource1.png";
 
   std::vector<GURL> urls = {GURL(https_resource), GURL(http_resource)};
 
   prefetcher_ = base::MakeUnique<TestResourcePrefetcher>(
-      &prefetcher_delegate_, config_, GURL(url), urls);
+      &prefetcher_delegate_, kMaxConcurrentRequests,
+      kMaxConcurrentRequestsPerHost, GURL(url), urls);
 
   AddStartUrlRequestExpectation(https_resource);
   AddStartUrlRequestExpectation(http_resource);
   prefetcher_->Start();
 
   net::URLRequest* request = GetInFlightRequest(https_resource);
   EXPECT_TRUE(request);
   EXPECT_EQ(url, request->referrer());
 
   request = GetInFlightRequest(http_resource);
   EXPECT_TRUE(request);
   EXPECT_EQ("", request->referrer());
 
   OnResponse(https_resource);
   OnResponse(http_resource);
 
   // Expect the final call.
   EXPECT_TRUE(
       prefetcher_delegate_.ResourcePrefetcherFinishedCalled(prefetcher_.get()));
 }
 
 }  // namespace predictors