NQE: Move params from the estimator class to the params class

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 437 matching lines @@
 
  private:
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            AdaptiveRecomputationEffectiveConnectionType);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, StoreObservations);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, TestAddObservation);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            DefaultObservationsOverridden);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            ObtainAlgorithmToUseFromParams);
-  FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, HalfLifeParam);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, ComputedPercentiles);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, TestGetMetricsSince);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            TestExternalEstimateProviderMergeEstimates);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            UnknownEffectiveConnectionType);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            TypicalNetworkQualities);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            OnPrefsReadWithReadingDisabled);
@@ skipping 193 matching lines @@
   // network quality. Set to true only for tests.
   bool use_small_responses_;
 
   // When set to true, the device offline check is disabled when computing the
   // effective connection type or when writing the prefs.
   bool disable_offline_check_;
 
   // If true, default values provided by the platform are used for estimation.
   const bool add_default_platform_observations_;
 
-  // The factor by which the weight of an observation reduces every second.
-  const double weight_multiplier_per_second_;
-
-  // 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.
-  const double weight_multiplier_per_dbm_;
-
   // Algorithm to use for computing effective connection type. The value is
   // obtained from field trial parameters. If the value from field trial
   // parameters is unavailable, it is set to
   // kDefaultEffectiveConnectionTypeAlgorithm.
   const EffectiveConnectionTypeAlgorithm effective_connection_type_algorithm_;
 
   // Tick clock used by the network quality estimator.
   std::unique_ptr<base::TickClock> tick_clock_;
 
   // Intervals after the main frame request arrives at which accuracy of network
@@ skipping 102 matching lines @@
   // Last known value of the wireless signal strength. Set to INT32_MIN if
   // unavailable. |signal_strength_dbm_| is reset to INT32_MIN on connection
   // change events.
   int32_t signal_strength_dbm_;
 
   // Minimum and maximum signal strength (in dBm) observed since last connection
   // change. Updated on connection change and main frame requests.
   int32_t min_signal_strength_since_connection_change_;
   int32_t max_signal_strength_since_connection_change_;
 
-  // It is costlier to add values to a sparse histogram. So, the correlation UMA
-  // is recorded with |correlation_uma_logging_probability_| since recording it
-  // in a sparse histogram for each request is unnecessary and cost-prohibitive.
-  // e.g., if it is 0.0, then the UMA will never be recorded. On the other hand,
-  // if it is 1.0, then it will be recorded for all valid HTTP requests.
-  const double correlation_uma_logging_probability_;
-
   // Stores the qualities of different networks.
   std::unique_ptr<nqe::internal::NetworkQualityStore> network_quality_store_;
 
-  // True if effective connection type value has been forced via variation
-  // parameters. If set to true, GetEffectiveConnectionType() will always return
-  // |forced_effective_connection_type_|.
-  const bool forced_effective_connection_type_set_;
-  const EffectiveConnectionType forced_effective_connection_type_;
-
   // Set to true if reading of the network quality prefs is enabled.
   const bool persistent_cache_reading_enabled_;

[RyanSturm, 2017/05/03 17:41:02]

move this too

[tbansal1, 2017/05/03 23:17:25]

Done.

 
   base::ThreadChecker thread_checker_;
 
   // Manages the writing of events to the net log.
   nqe::internal::EventCreator event_creator_;
 
   // Vector that contains observation sources that should not be used when
   // computing the estimate at HTTP layer.
   const std::vector<NetworkQualityObservationSource>
       disallowed_observation_sources_for_http_;
 
   // Vector that contains observation sources that should not be used when
   // computing the estimate at transport layer.
   const std::vector<NetworkQualityObservationSource>
       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_