Move more variables to NQE params class

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>
 
@@ skipping 26 matching lines @@
 
   ~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(
-      net::NetworkChangeNotifier::ConnectionType connection_type);
+      NetworkChangeNotifier::ConnectionType connection_type);
 
-  // Sets the default observation for different connection types in
-  // |default_observations|. 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.
-  void ObtainDefaultObservations(
-      nqe::internal::NetworkQuality default_observations[]) const;
+  // 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(
+      NetworkChangeNotifier::ConnectionType type) const;
 
-  // Sets |typical_network_quality| to typical network quality for different
-  // effective connection types.
-  void ObtainTypicalNetworkQuality(
-      NetworkQuality typical_network_quality[]) const;
+  // Returns the typical network quality for connection |type|.
+  const NetworkQuality& TypicalNetworkQuality(
+      EffectiveConnectionType type) const;
 
-  // Sets the thresholds for different effective connection types in
-  // |connection_thresholds|.
-  void ObtainEffectiveConnectionTypeModelParams(
-      nqe::internal::NetworkQuality connection_thresholds[]) const;
+  // Returns the threshold for effective connection type |type|.
+  const NetworkQuality& ConnectionThreshold(EffectiveConnectionType type) const;
 
   // Returns the weight multiplier per second, which represents the factor by
   // which the weight of an observation reduces every second.
   double weight_multiplier_per_second() const {
     return weight_multiplier_per_second_;
   }
 
   // Returns the factor by which the weight of an observation reduces for every
   // dBm difference between the current signal strength (in dBm), and the signal
   // strength at the time when the observation was taken.
@@ skipping 32 matching lines @@
   const std::map<std::string, std::string> params_;
 
   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_|. The
+  // observations are indexed by ConnectionType.

[RyanSturm, 2017/05/16 22:36:55]

If the second sentence is necessary, add something similar to the two things
below.

[tbansal1, 2017/05/16 23:07:40]

Done.

+  NetworkQuality
+      default_observations_[NetworkChangeNotifier::CONNECTION_LAST + 1];
+
+  // Typical network quality for different effective connection types obtained
+  // from |params_|.
+  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_
+      [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_