Pass parsed network quality estimator params when constructing NQE

net/nqe/throughput_analyzer_unittest.cc

 // Copyright 2016 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 "net/nqe/throughput_analyzer.h"
 
 #include <stdint.h>
 
 #include <deque>
 #include <map>
@@ skipping 16 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace nqe {
 
 namespace {
 
 class TestThroughputAnalyzer : public internal::ThroughputAnalyzer {
  public:
-  explicit TestThroughputAnalyzer(
-      internal::NetworkQualityEstimatorParams* params)
+  explicit TestThroughputAnalyzer(NetworkQualityEstimatorParams* params)
       : internal::ThroughputAnalyzer(
             params,
             base::ThreadTaskRunnerHandle::Get(),
             base::Bind(
                 &TestThroughputAnalyzer::OnNewThroughputObservationAvailable,
                 base::Unretained(this)),
             false,
             false),
         throughput_observations_received_(0),
         bits_received_(0) {}
@@ skipping 29 matching lines @@
     bool use_local_requests;
   } tests[] = {{
                    false,
                },
                {
                    true,
                }};
 
   for (const auto& test : tests) {
     std::map<std::string, std::string> variation_params;
-    internal::NetworkQualityEstimatorParams params(variation_params);
+    NetworkQualityEstimatorParams params(variation_params);
     TestThroughputAnalyzer throughput_analyzer(&params);
 
     TestDelegate test_delegate;
     TestURLRequestContext context;
 
     ASSERT_FALSE(throughput_analyzer.disable_throughput_measurements());
     std::deque<std::unique_ptr<URLRequest>> requests;
 
     // Start more requests than the maximum number of requests that can be held
     // in the memory.
@@ skipping 31 matching lines @@
           true, false, false,
       },
       {
           true, true, true,
       },
   };
 
   for (const auto& test : tests) {
     // Localhost requests are not allowed for estimation purposes.
     std::map<std::string, std::string> variation_params;
-    internal::NetworkQualityEstimatorParams params(variation_params);
+    NetworkQualityEstimatorParams params(variation_params);
     TestThroughputAnalyzer throughput_analyzer(&params);
 
     TestDelegate test_delegate;
     TestURLRequestContext context;
 
     std::unique_ptr<URLRequest> request_local;
 
     std::unique_ptr<URLRequest> request_not_local(context.CreateRequest(
         GURL("http://example.com/echo.html"), DEFAULT_PRIORITY, &test_delegate,
         TRAFFIC_ANNOTATION_FOR_TESTS));
@@ skipping 68 matching lines @@
       {
           1, 2, 1, false,
       },
   };
 
   for (const auto& test : tests) {
     // Localhost requests are not allowed for estimation purposes.
     std::map<std::string, std::string> variation_params;
     variation_params["throughput_min_requests_in_flight"] =
         base::IntToString(test.throughput_min_requests_in_flight);
-    internal::NetworkQualityEstimatorParams params(variation_params);
+    NetworkQualityEstimatorParams params(variation_params);
     TestThroughputAnalyzer throughput_analyzer(&params);
     TestDelegate test_delegate;
     TestURLRequestContext context;
 
     EXPECT_EQ(0, throughput_analyzer.throughput_observations_received());
 
     std::vector<std::unique_ptr<URLRequest>> requests_in_flight;
 
     for (size_t i = 0; i < test.number_requests_in_flight; ++i) {
       std::unique_ptr<URLRequest> request_network_1 = context.CreateRequest(
@@ skipping 31 matching lines @@
     }
   }
 }
 
 // Tests if the throughput observation is taken correctly when the start and end
 // of network requests overlap, and the minimum number of in flight requests
 // when taking an observation is more than 1.
 TEST(ThroughputAnalyzerTest, TestThroughputWithMultipleNetworkRequests) {
   std::map<std::string, std::string> variation_params;
   variation_params["throughput_min_requests_in_flight"] = "3";
-  internal::NetworkQualityEstimatorParams params(variation_params);
+  NetworkQualityEstimatorParams params(variation_params);
   TestThroughputAnalyzer throughput_analyzer(&params);
   TestDelegate test_delegate;
   TestURLRequestContext context;
 
   EXPECT_EQ(0, throughput_analyzer.throughput_observations_received());
 
   std::unique_ptr<URLRequest> request_1 = context.CreateRequest(
       GURL("http://example.com/echo.html"), DEFAULT_PRIORITY, &test_delegate,
       TRAFFIC_ANNOTATION_FOR_TESTS);
   std::unique_ptr<URLRequest> request_2 = context.CreateRequest(
@@ skipping 45 matching lines @@
   throughput_analyzer.NotifyRequestCompleted(*(request_3.get()));
   throughput_analyzer.NotifyRequestCompleted(*(request_4.get()));
   EXPECT_EQ(1, throughput_analyzer.throughput_observations_received());
 }
 
 }  // namespace
 
 }  // namespace nqe
 
 }  // namespace net