NQE: Move ECT to net:: namespace

net/nqe/network_quality_estimator.cc

 // 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.
 
 #include "net/nqe/network_quality_estimator.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <utility>
@@ skipping 295 matching lines @@
   base::HistogramBase* histogram = base::Histogram::FactoryGet(
       histogram_name, 1, 1000 * 1000 /* 1 Gbps */, 50 /* Number of buckets */,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->Add(std::abs(metric));
 }
 
 void RecordEffectiveConnectionTypeAccuracy(
     const char* prefix,
     int32_t metric,
     base::TimeDelta measuring_duration,
-    net::NetworkQualityEstimator::EffectiveConnectionType
-        observed_effective_connection_type) {
+    net::EffectiveConnectionType observed_effective_connection_type) {
   const std::string histogram_name = base::StringPrintf(
       "%s.EstimatedObservedDiff.%s.%d.%s", prefix,
       metric >= 0 ? "Positive" : "Negative",
       static_cast<int32_t>(measuring_duration.InSeconds()),
       net::NetworkQualityEstimator::GetNameForEffectiveConnectionType(
           observed_effective_connection_type));
 
   base::HistogramBase* histogram = base::Histogram::FactoryGet(
-      histogram_name, 0,
-      net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_LAST,
-      net::NetworkQualityEstimator::
-          EFFECTIVE_CONNECTION_TYPE_LAST /* Number of buckets */,
+      histogram_name, 0, net::EFFECTIVE_CONNECTION_TYPE_LAST,
+      net::EFFECTIVE_CONNECTION_TYPE_LAST /* Number of buckets */,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->Add(std::abs(metric));
 }
 
 }  // namespace
 
 namespace net {
 
 NetworkQualityEstimator::NetworkQualityEstimator(
     std::unique_ptr<ExternalEstimateProvider> external_estimates_provider,
@@ skipping 803 matching lines @@
       base::Histogram::FactoryGet(
           std::string("NQE.MainFrame.EffectiveConnectionType.") +
               GetNameForConnectionType(current_network_id_.type),
           0, EFFECTIVE_CONNECTION_TYPE_LAST,
           EFFECTIVE_CONNECTION_TYPE_LAST /* Number of buckets */,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   effective_connection_type_histogram->Add(effective_connection_type);
 }
 
-NetworkQualityEstimator::EffectiveConnectionType
-NetworkQualityEstimator::GetEffectiveConnectionType() const {
+EffectiveConnectionType NetworkQualityEstimator::GetEffectiveConnectionType()
+    const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return GetRecentEffectiveConnectionType(base::TimeTicks());
 }
 
-NetworkQualityEstimator::EffectiveConnectionType
+EffectiveConnectionType
 NetworkQualityEstimator::GetRecentEffectiveConnectionType(
     const base::TimeTicks& start_time) const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (effective_connection_type_algorithm_ ==
       EffectiveConnectionTypeAlgorithm::HTTP_RTT_AND_DOWNSTREAM_THROUGHOUT) {
     return GetRecentEffectiveConnectionTypeUsingMetrics(
         start_time, NetworkQualityEstimator::MetricUsage::
                         MUST_BE_USED /* http_rtt_metric */,
         NetworkQualityEstimator::MetricUsage::
@@ skipping 27 matching lines @@
   if (effective_connection_type_algorithm_ ==
       EffectiveConnectionTypeAlgorithm::
           TRANSPORT_RTT_OR_DOWNSTREAM_THROUGHOUT) {
     return true;
   }
   // Add additional algorithms here.
   NOTREACHED();
   return false;
 }
 
-NetworkQualityEstimator::EffectiveConnectionType
+EffectiveConnectionType
 NetworkQualityEstimator::GetRecentEffectiveConnectionTypeUsingMetrics(
     const base::TimeTicks& start_time,
     NetworkQualityEstimator::MetricUsage http_rtt_metric,
     NetworkQualityEstimator::MetricUsage transport_rtt_metric,
     NetworkQualityEstimator::MetricUsage downstream_throughput_kbps_metric)
     const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If the device is currently offline, then return
   // EFFECTIVE_CONNECTION_TYPE_OFFLINE.
@@ skipping 319 matching lines @@
     case EFFECTIVE_CONNECTION_TYPE_BROADBAND:
       return "Broadband";
     default:
       NOTREACHED();
       break;
   }
   return "";
 }
 
 // static
-NetworkQualityEstimator::EffectiveConnectionType
+EffectiveConnectionType
 NetworkQualityEstimator::GetEffectiveConnectionTypeForName(
     const std::string& connection_type_name) {
   if (connection_type_name == "Unknown")
     return EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
   if (connection_type_name == "Offline")
     return EFFECTIVE_CONNECTION_TYPE_OFFLINE;
   if (connection_type_name == "Slow2G")
     return EFFECTIVE_CONNECTION_TYPE_SLOW_2G;
   if (connection_type_name == "2G")
     return EFFECTIVE_CONNECTION_TYPE_2G;
@@ skipping 107 matching lines @@
     NotifyObserversOfEffectiveConnectionTypeChanged() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // TODO(tbansal): Add hysteresis in the notification.
   FOR_EACH_OBSERVER(
       EffectiveConnectionTypeObserver, effective_connection_type_observer_list_,
       OnEffectiveConnectionTypeChanged(effective_connection_type_));
 }
 
 }  // namespace net