Pass parsed network quality estimator params when constructing NQE

net/nqe/network_quality_estimator_params.h

 // 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.
 
 #ifndef NET_NQE_NETWORK_QUALITY_ESTIMATOR_PARAMS_H_
 #define NET_NQE_NETWORK_QUALITY_ESTIMATOR_PARAMS_H_
 
 #include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/threading/thread_checker.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/nqe/effective_connection_type.h"
 #include "net/nqe/network_quality.h"
 
 namespace net {
 
 // Forces NQE to return a specific effective connection type. Set using the
 // |params| provided to the NetworkQualityEstimatorParams constructor.
 NET_EXPORT extern const char kForceEffectiveConnectionType[];
 
-namespace nqe {
-
-namespace internal {
-
 // NetworkQualityEstimatorParams computes the configuration parameters for
 // the network quality estimator.
-class NET_EXPORT_PRIVATE NetworkQualityEstimatorParams {
+class NET_EXPORT NetworkQualityEstimatorParams {
  public:
   // |params| is the map containing all field trial parameters related to
   // NetworkQualityEstimator field trial.
   explicit NetworkQualityEstimatorParams(
       const std::map<std::string, std::string>& params);
 
   ~NetworkQualityEstimatorParams();
 
   // Returns the algorithm that should be used for computing effective
   // connection type. Returns an empty string if a valid algorithm paramter is
   // not specified.
   std::string GetEffectiveConnectionTypeAlgorithm() const;
 
   // Returns a descriptive name corresponding to |connection_type|.
   static const char* GetNameForConnectionType(
       NetworkChangeNotifier::ConnectionType connection_type);
 
   // Returns the default observation for connection |type|. The default
   // observations are different for different connection types (e.g., 2G, 3G,
   // 4G, WiFi). The default observations may be used to determine the network
   // quality in absence of any other information.
-  const NetworkQuality& DefaultObservation(
+  const nqe::internal::NetworkQuality& DefaultObservation(
       NetworkChangeNotifier::ConnectionType type) const;
 
   // Returns the typical network quality for connection |type|.
-  const NetworkQuality& TypicalNetworkQuality(
+  const nqe::internal::NetworkQuality& TypicalNetworkQuality(
       EffectiveConnectionType type) const;
 
   // Returns the threshold for effective connection type |type|.
-  const NetworkQuality& ConnectionThreshold(EffectiveConnectionType type) const;
+  const nqe::internal::NetworkQuality& ConnectionThreshold(
+      EffectiveConnectionType type) const;
 
   // Returns the minimum number of requests in-flight to consider the network
   // fully utilized. A throughput observation is taken only when the network is
   // considered as fully utilized.
   size_t throughput_min_requests_in_flight() const {
     return throughput_min_requests_in_flight_;
   }
 
   // Returns the weight multiplier per second, which represents the factor by
   // which the weight of an observation reduces every second.
@@ skipping 41 matching lines @@
   const size_t throughput_min_requests_in_flight_;
   const double weight_multiplier_per_second_;
   const double weight_multiplier_per_dbm_;
   const double correlation_uma_logging_probability_;
   const base::Optional<EffectiveConnectionType>
       forced_effective_connection_type_;
   const bool persistent_cache_reading_enabled_;
   const base::TimeDelta min_socket_watcher_notification_interval_;
 
   // Default network quality observations obtained from |params_|.
-  NetworkQuality
+  nqe::internal::NetworkQuality
       default_observations_[NetworkChangeNotifier::CONNECTION_LAST + 1];
 
   // Typical network quality for different effective connection types obtained
   // from |params_|.
-  NetworkQuality typical_network_quality_
+  nqe::internal::NetworkQuality typical_network_quality_
       [EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_LAST];
 
   // Thresholds for different effective connection types obtained from
   // |params_|. These thresholds encode how different connection types behave
   // in general.
-  NetworkQuality connection_thresholds_
+  nqe::internal::NetworkQuality connection_thresholds_
       [EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_LAST];
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimatorParams);
 };
 
-}  // namespace internal
-
-}  // namespace nqe
-
 }  // namespace net
 
 #endif  // NET_NQE_NETWORK_QUALITY_ESTIMATOR_PARAMS_H_