Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_change_notifier_chromeos.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 181 matching lines @@
   ip_address_ = default_network->ip_address();
   dns_servers_ = default_network->dns_servers();
 }
 
 // static
 net::NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierChromeos::ConnectionTypeFromShill(
     const std::string& type, const std::string& technology) {
   if (NetworkTypePattern::Ethernet().MatchesType(type))
     return CONNECTION_ETHERNET;
-  else if (type == flimflam::kTypeWifi)
+  else if (type == shill::kTypeWifi)
     return CONNECTION_WIFI;
-  else if (type == flimflam::kTypeWimax)
+  else if (type == shill::kTypeWimax)
     return CONNECTION_4G;
 
-  if (type != flimflam::kTypeCellular)
+  if (type != shill::kTypeCellular)
     return CONNECTION_UNKNOWN;
 
   // For cellular types, mapping depends on the technology.
-  if (technology == flimflam::kNetworkTechnologyEvdo ||
-      technology == flimflam::kNetworkTechnologyGsm ||
-      technology == flimflam::kNetworkTechnologyUmts ||
-      technology == flimflam::kNetworkTechnologyHspa) {
+  if (technology == shill::kNetworkTechnologyEvdo ||
+      technology == shill::kNetworkTechnologyGsm ||
+      technology == shill::kNetworkTechnologyUmts ||
+      technology == shill::kNetworkTechnologyHspa) {
     return CONNECTION_3G;
-  } else if (technology == flimflam::kNetworkTechnologyHspaPlus ||
-             technology == flimflam::kNetworkTechnologyLte ||
-             technology == flimflam::kNetworkTechnologyLteAdvanced) {
+  } else if (technology == shill::kNetworkTechnologyHspaPlus ||
+             technology == shill::kNetworkTechnologyLte ||
+             technology == shill::kNetworkTechnologyLteAdvanced) {
     return CONNECTION_4G;
   } else {
     return CONNECTION_2G;  // Default cellular type is 2G.
   }
 }
 
 // static
 net::NetworkChangeNotifier::NetworkChangeCalculatorParams
 NetworkChangeNotifierChromeos::NetworkChangeCalculatorParamsChromeos() {
   NetworkChangeCalculatorParams params;
   // Delay values arrived at by simple experimentation and adjusted so as to
   // produce a single signal when switching between network connections.
   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
   params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
   params.connection_type_offline_delay_ =
       base::TimeDelta::FromMilliseconds(500);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
   return params;
 }
 
 }  // namespace chromeos