Pass parsed network quality estimator params when constructing NQE

net/nqe/network_quality_estimator.h

 // Copyright 2015 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.
 
 #ifndef NET_NQE_NETWORK_QUALITY_ESTIMATOR_H_
 #define NET_NQE_NETWORK_QUALITY_ESTIMATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 86 matching lines @@
 
    protected:
     ThroughputObserver() {}
     virtual ~ThroughputObserver() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(ThroughputObserver);
   };
 
   // Creates a new NetworkQualityEstimator.
-  // |variation_params| is the map containing all field trial parameters
-  // related to NetworkQualityEstimator field trial.
-  // |external_estimates_provider| may be NULL. The caller must guarantee that
-  // |net_log| outlives |this|.
+  // |external_estimates_provider| may be NULL. |params| contains the
+  // configuration parameters relevant to network quality estimator. The caller
+  // must guarantee that |net_log| outlives |this|.
   NetworkQualityEstimator(
       std::unique_ptr<ExternalEstimateProvider> external_estimates_provider,
-      const std::map<std::string, std::string>& variation_params,
-      NetLog* net_log);
-
-  // Construct a NetworkQualityEstimator instance allowing for test
-  // configuration. Registers for network type change notifications so estimates
-  // can be kept network specific.
-  // |external_estimates_provider| may be NULL.
-  // |variation_params| is the map containing all field trial parameters for the
-  // network quality estimator field trial.
-  // |use_local_host_requests_for_tests| should only be true when testing
-  // against local HTTP server and allows the requests to local host to be
-  // used for network quality estimation.
-  // |use_smaller_responses_for_tests| should only be true when testing.
-  // Allows the responses smaller than |kMinTransferSizeInBits| to be used for
-  // network quality estimation. The caller must guarantee that |net_log|
-  // outlives |this|.
-  NetworkQualityEstimator(
-      std::unique_ptr<ExternalEstimateProvider> external_estimates_provider,
-      const std::map<std::string, std::string>& variation_params,
-      bool use_local_host_requests_for_tests,
-      bool use_smaller_responses_for_tests,
+      std::unique_ptr<NetworkQualityEstimatorParams> params,
       NetLog* net_log);
 
   ~NetworkQualityEstimator() override;
 
   // Returns the effective type of the current connection based on only the
   // samples observed after |start_time|. This should only be used for
   // recording the metrics. Virtualized for testing.
   virtual EffectiveConnectionType GetRecentEffectiveConnectionType(
       const base::TimeTicks& start_time) const;
 
@@ skipping 79 matching lines @@
           observer);
 
   // Called when the persistent prefs have been read. |read_prefs| contains the
   // parsed prefs as a map between NetworkIDs and CachedNetworkQualities.
   void OnPrefsRead(
       const std::map<nqe::internal::NetworkID,
                      nqe::internal::CachedNetworkQuality> read_prefs);
 
  protected:
   // A protected constructor for testing that allows setting the value of
-  // |add_default_platform_observations_|.
+  // configuration params.
+  // |use_local_host_requests_for_tests| should only be true when testing
+  // against local HTTP server and allows the requests to local host to be
+  // used for network quality estimation.
+  // |use_smaller_responses_for_tests| should only be true when testing.
+  // Allows the responses smaller than |kMinTransferSizeInBits| to be used for
+  // network quality estimation.
+  // |add_default_platform_observations_| should be false only if |this| should
+  // not generate observations based on the platform and/or connection type.
   NetworkQualityEstimator(
       std::unique_ptr<ExternalEstimateProvider> external_estimates_provider,
-      const std::map<std::string, std::string>& variation_params,
+      std::unique_ptr<NetworkQualityEstimatorParams> params,
       bool use_local_host_requests_for_tests,
       bool use_smaller_responses_for_tests,
       bool add_default_platform_observations,
       const NetLogWithSource& net_log);
 
   // Different experimental statistic algorithms that can be used for computing
   // the predictions.
   enum Statistic {
     STATISTIC_WEIGHTED_AVERAGE = 0,
     STATISTIC_UNWEIGHTED_AVERAGE = 1,
@@ skipping 288 matching lines @@
   // May update the network quality of the current network if |network_id|
   // matches the ID of the current network. |cached_network_quality| is the
   // cached network quality of the network with id |network_id|.
   void MaybeUpdateNetworkQualityFromCache(
       const nqe::internal::NetworkID& network_id,
       const nqe::internal::CachedNetworkQuality& cached_network_quality);
 
   const char* GetNameForStatistic(int i) const;
 
   // Params to configure the network quality estimator.
-  const nqe::internal::NetworkQualityEstimatorParams params_;
+  const std::unique_ptr<NetworkQualityEstimatorParams> params_;
 
   // Determines if the requests to local host can be used in estimating the
   // network quality. Set to true only for tests.
   bool use_localhost_requests_;
 
   // Determines if the responses smaller than |kMinTransferSizeInBytes|
   // or shorter than |kMinTransferSizeInBytes| can be used in estimating the
   // network quality. Set to true only for tests.
   bool use_small_responses_;
 
@@ skipping 120 matching lines @@
       disallowed_observation_sources_for_transport_;
 
   base::WeakPtrFactory<NetworkQualityEstimator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimator);
 };
 
 }  // namespace net
 
 #endif  // NET_NQE_NETWORK_QUALITY_ESTIMATOR_H_