NQE: Move ECT to net:: namespace

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>
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/nqe/cached_network_quality.h"
+#include "net/nqe/effective_connection_type.h"
 #include "net/nqe/external_estimate_provider.h"
 #include "net/nqe/network_id.h"
 #include "net/nqe/network_quality.h"
 #include "net/nqe/network_quality_observation.h"
 #include "net/nqe/network_quality_observation_source.h"
 #include "net/nqe/network_quality_store.h"
 #include "net/nqe/observation_buffer.h"
 #include "net/socket/socket_performance_watcher_factory.h"
 
 namespace base {
@@ skipping 15 matching lines @@
 // The estimates are based on the observed organic traffic.
 // A NetworkQualityEstimator instance is attached to URLRequestContexts and
 // observes the traffic of URLRequests spawned from the URLRequestContexts.
 // A single instance of NQE can be attached to multiple URLRequestContexts,
 // thereby increasing the single NQE instance's accuracy by providing more
 // observed traffic characteristics.
 class NET_EXPORT NetworkQualityEstimator
     : public NetworkChangeNotifier::ConnectionTypeObserver,
       public ExternalEstimateProvider::UpdatedEstimateDelegate {
  public:
-  // EffectiveConnectionType is the connection type whose typical performance is
-  // most similar to the measured performance of the network in use. In many
-  // cases, the "effective" connection type and the actual type of connection in
-  // use are the same, but often a network connection performs significantly
-  // different, usually worse, from its expected capabilities.
-  // EffectiveConnectionType of a network is independent of if the current
-  // connection is metered or not. For example, an unmetered slow connection may
-  // have EFFECTIVE_CONNECTION_TYPE_SLOW_2G as its effective connection type.
-  enum EffectiveConnectionType {
-    // The connection types should be in increasing order of quality.
-    EFFECTIVE_CONNECTION_TYPE_UNKNOWN = 0,
-    EFFECTIVE_CONNECTION_TYPE_OFFLINE,
-    EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
-    EFFECTIVE_CONNECTION_TYPE_2G,
-    EFFECTIVE_CONNECTION_TYPE_3G,
-    EFFECTIVE_CONNECTION_TYPE_4G,
-    EFFECTIVE_CONNECTION_TYPE_BROADBAND,
-    EFFECTIVE_CONNECTION_TYPE_LAST,
-  };
-
   // Observes changes in effective connection type.
   class NET_EXPORT EffectiveConnectionTypeObserver {
    public:
     // Notifies the observer of a change in the effective connection type.
     // NetworkQualityEstimator computes the effective connection type once in
     // every interval of duration
     // |effective_connection_type_recomputation_interval_|. Additionally, when
     // there is a change in the connection type of the device, then the
     // effective connection type is immediately recomputed. The observer must
     // register and unregister itself on the IO thread. All the observers would
@@ skipping 472 matching lines @@
   // Default network quality observations obtained from the network quality
   // estimator field trial parameters. The observations are indexed by
   // ConnectionType.
   nqe::internal::NetworkQuality
       default_observations_[NetworkChangeNotifier::CONNECTION_LAST + 1];
 
   // Default thresholds for different effective connection types. The default
   // values are used if the thresholds are unavailable from the variation
   // params.
   nqe::internal::NetworkQuality default_effective_connection_type_thresholds_
-      [EFFECTIVE_CONNECTION_TYPE_LAST];
+      [EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_LAST];
 
   // Thresholds for different effective connection types obtained from field
   // trial variation params. These thresholds encode how different connection
   // types behave in general. In future, complex encodings (e.g., curve
   // fitting) may be used.
-  nqe::internal::NetworkQuality
-      connection_thresholds_[EFFECTIVE_CONNECTION_TYPE_LAST];
+  nqe::internal::NetworkQuality connection_thresholds_
+      [EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_LAST];
 
   // Latest time when the headers for a main frame request were received.
   base::TimeTicks last_main_frame_request_;
 
   // Estimated network quality when the response headers for the last mainframe
   // request were received.
   nqe::internal::NetworkQuality estimated_quality_at_last_main_frame_;
   EffectiveConnectionType effective_connection_type_at_last_main_frame_;
 
   // Estimated network quality obtained from external estimate provider when the
@@ skipping 44 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<NetworkQualityEstimator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimator);
 };
 
 }  // namespace net
 
 #endif  // NET_NQE_NETWORK_QUALITY_ESTIMATOR_H_