Populate EEP estimate in NQE

net/base/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_BASE_NETWORK_QUALITY_ESTIMATOR_H_
 #define NET_BASE_NETWORK_QUALITY_ESTIMATOR_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "net/base/external_estimate_provider.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 class URLRequest;
 
@@ skipping 106 matching lines @@
       bool allow_local_host_requests_for_tests,
       bool allow_smaller_responses_for_tests);
 
   // Returns true if the cached network quality estimate was successfully read.
   bool ReadCachedNetworkQualityEstimate();
 
   // NetworkChangeNotifier::ConnectionTypeObserver implementation.
   void OnConnectionTypeChanged(
       NetworkChangeNotifier::ConnectionType type) override;
 
+  // ExternalEstimateProvider::UpdatedEstimateObserver implementation.
+  void OnUpdatedEstimateAvailable() override;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, StoreObservations);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, TestKbpsRTTUpdates);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, TestAddObservation);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, ObtainOperatingParams);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest, HalfLifeParam);
   FRIEND_TEST_ALL_PREFIXES(URLRequestTestHTTP, NetworkQualityEstimator);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
                            PercentileSameTimestamps);
   FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
@@ skipping 183 matching lines @@
   static const int kMinimumThroughputVariationParameterKbps = 1;
 
   // Maximum size of the cache that holds network quality estimates.
   // Smaller size may reduce the cache hit rate due to frequent evictions.
   // Larger size may affect performance.
   static const size_t kMaximumNetworkQualityCacheSize = 10;
 
   // Maximum number of observations that can be held in the ObservationBuffer.
   static const size_t kMaximumObservationsBufferSize = 300;
 
+  // Minimum time duration (in milliseconds) between consecutive queries to
+  // external estimate provider.
+  static const int kExternalEstimateProviderQueryIntervalMsec = 5 * 60 * 1000;
+
   // Returns the RTT value to be used when the valid RTT is unavailable. Readers
   // should discard RTT if it is set to the value returned by |InvalidRTT()|.
   static const base::TimeDelta InvalidRTT();
 
-  // ExternalEstimateProvider::UpdatedEstimateObserver implementation.
-  void OnUpdatedEstimateAvailable() override;
+  // Queries the external estimate provider for the latest network quality
+  // estimates, and adds those estimates to the current observation buffer.
+  void QueryExternalEstimateProvider();
+
+  // Called when the posted task to query external estimate provider is ran.
+  void RunExternalEstimateProviderDelayedTask();
 
   // Obtains operating parameters from the field trial parameters.
   void ObtainOperatingParams(
       const std::map<std::string, std::string>& variation_params);
 
   // Adds the default median RTT and downstream throughput estimate for the
   // current connection type to the observation buffer.
   void AddDefaultEstimates();
 
   // Returns an estimate of network quality at the specified |percentile|.
@@ skipping 63 matching lines @@
   NetworkQuality
       default_observations_[NetworkChangeNotifier::CONNECTION_LAST + 1];
 
   // Estimated network quality. Updated on mainframe requests.
   NetworkQuality estimated_median_network_quality_;
 
   // ExternalEstimateProvider that provides network quality using operating
   // system APIs. May be NULL.
   const scoped_ptr<ExternalEstimateProvider> external_estimates_provider_;
 
+  // Time when the external estimate provider (eep) was last queried.
+  base::TimeTicks eep_queried_;
+
+  // True if a delayed task querying the external estimate provider has been
+  // posted.
+  bool eep_delayed_task_posted_;

[bengr, 2015/09/02 20:27:56]

How about external_estimate_pending_?

[tbansal1, 2015/09/03 00:22:40]

Done.

+
+  // Values of external estimate provider status.
+  // This enum must remain synchronized with the enum of the same name in
+  // metrics/histograms/histograms.xml.
+  enum NQEExternalEstimateProviderStatus {
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_NOT_AVAILABLE,
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_AVAILABLE,
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_QUERIED,
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_QUERY_SUCCESSFUL,
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_CALLBACK,
+    EXTERNAL_ESTIMATE_PROVIDER_STATUS_BOUNDARY
+  };
+
   base::ThreadChecker thread_checker_;
 
+  // Used for posting tasks.
+  base::WeakPtrFactory<NetworkQualityEstimator> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimator);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_QUALITY_ESTIMATOR_H_