Cleanup network type matching.

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"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_config_service_posix.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 // DNS config services on Chrome OS are signalled by the network state handler
 // rather than relying on watching files in /etc.
 class NetworkChangeNotifierChromeos::DnsConfigService
     : public net::internal::DnsConfigServicePosix {
@@ skipping 163 matching lines @@
   connection_type_ = new_connection_type;
   service_path_ = default_network->path();
   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 (type == flimflam::kTypeEthernet)
+  if (NetworkTypePattern::Ethernet().MatchesType(type))
     return CONNECTION_ETHERNET;
   else if (type == flimflam::kTypeWifi)
     return CONNECTION_WIFI;
   else if (type == flimflam::kTypeWimax)
     return CONNECTION_4G;
 
   if (type != flimflam::kTypeCellular)
     return CONNECTION_UNKNOWN;
 
   // For cellular types, mapping depends on the technology.
@@ skipping 19 matching lines @@
   // 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