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"
@@ skipping 178 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 (type == flimflam::kTypeEthernet || type == shill::kTypeEthernetEap)

[stevenjb, 2013/09/04 20:40:39]

We should probably use MatchType here, just to keep this logic in one place.

[pneubeck (no reviews), 2013/09/05 08:28:34]

Done.

     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