Add function that converts string connection type to ECT

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 1056 matching lines @@
         EXTERNAL_ESTIMATE_PROVIDER_STATUS_DOWNLINK_BANDWIDTH_AVAILABLE);
     UMA_HISTOGRAM_COUNTS("NQE.ExternalEstimateProvider.DownlinkBandwidth",
                          downstream_throughput_kbps);
     downstream_throughput_kbps_observations_.AddObservation(
         ThroughputObservation(
             downstream_throughput_kbps, tick_clock_->NowTicks(),
             NETWORK_QUALITY_OBSERVATION_SOURCE_EXTERNAL_ESTIMATE));
   }
 }
 
+// static
 const char* NetworkQualityEstimator::GetNameForEffectiveConnectionType(
-    EffectiveConnectionType type) const {
+    EffectiveConnectionType type) {
   switch (type) {
     case EFFECTIVE_CONNECTION_TYPE_UNKNOWN:
       return "Unknown";
     case EFFECTIVE_CONNECTION_TYPE_OFFLINE:
       return "Offline";
     case EFFECTIVE_CONNECTION_TYPE_SLOW_2G:
       return "Slow2G";
     case EFFECTIVE_CONNECTION_TYPE_2G:
       return "2G";
     case EFFECTIVE_CONNECTION_TYPE_3G:
       return "3G";
     case EFFECTIVE_CONNECTION_TYPE_4G:
       return "4G";
     case EFFECTIVE_CONNECTION_TYPE_BROADBAND:
       return "Broadband";
     default:
       NOTREACHED();
       break;
   }
   return "";
 }
 
+// static
+NetworkQualityEstimator::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;
+  if (connection_type_name == "3G")
+    return EFFECTIVE_CONNECTION_TYPE_3G;
+  if (connection_type_name == "4G")
+    return EFFECTIVE_CONNECTION_TYPE_4G;
+  if (connection_type_name == "Broadband")
+    return EFFECTIVE_CONNECTION_TYPE_BROADBAND;
+  NOTREACHED();
+  return EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
+}
+
 void NetworkQualityEstimator::SetTickClockForTesting(
     std::unique_ptr<base::TickClock> tick_clock) {
   DCHECK(thread_checker_.CalledOnValidThread());
   tick_clock_ = std::move(tick_clock);
 }
 
 void NetworkQualityEstimator::CacheNetworkQualityEstimate() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_LE(cached_network_qualities_.size(),
             static_cast<size_t>(kMaximumNetworkQualityCacheSize));
@@ skipping 128 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