Cleanup network type matching.

chromeos/network/network_state_handler.cc

Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 878e152c3d19db607fcffdf50262127694b1f53d..bfb232fae1d1a1bbd0a54e3f5f8e0d4e3f4b3e5d 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -42,8 +42,13 @@ bool ManagedStateMatchesType(const ManagedState* managed,
       type != flimflam::kTypeVPN) {
     return true;
   }
+  if (match_type == NetworkStateHandler::kMatchTypeWired &&
+      (type == flimflam::kTypeEthernet || type == shill::kTypeEthernetEap)) {
+    return true;
+  }
   if (match_type == NetworkStateHandler::kMatchTypeWireless &&
-      type != flimflam::kTypeEthernet && type != flimflam::kTypeVPN) {
+      type != flimflam::kTypeEthernet && type != shill::kTypeEthernetEap &&
+      type != flimflam::kTypeVPN) {
     return true;
   }
   if (match_type == NetworkStateHandler::kMatchTypeMobile &&
@@ -83,6 +88,7 @@ std::string GetManagedStateLogName(const ManagedState* state) {
 }  // namespace
 
 const char NetworkStateHandler::kMatchTypeDefault[] = "default";
+const char NetworkStateHandler::kMatchTypeWired[] = "wired";
 const char NetworkStateHandler::kMatchTypeWireless[] = "wireless";
 const char NetworkStateHandler::kMatchTypeMobile[] = "mobile";
 const char NetworkStateHandler::kMatchTypeNonVirtual[] = "non-virtual";
@@ -727,6 +733,9 @@ void NetworkStateHandler::ScanCompleted(const std::string& type) {
 
 std::string NetworkStateHandler::GetTechnologyForType(
     const std::string& type) const {
+  if (type == kMatchTypeWired || type == shill::kTypeEthernetEap)

[stevenjb, 2013/08/28 15:51:30]

Another place where IsTypeWired(type) would be helpful.

[pneubeck (no reviews), 2013/09/02 20:41:21]

Since the old |type| argument could be a pattern/MatchType itself and I want to
avoid that we mistakenly swap the order in match ('supertype contains subtype'
vs. 'subtype contains supertype'), I introduced this NetworkTypePattern.

This class makes the matches more explicit and the usage of MatchTypes in method
arguments type-safe (compared to everything being a string).

+    return flimflam::kTypeEthernet;
+
   if (type == kMatchTypeMobile) {
     if (shill_property_handler_->IsTechnologyAvailable(flimflam::kTypeWimax))
       return flimflam::kTypeWimax;