Cleanup network type matching.

chrome/browser/chromeos/login/helper.cc

Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index a09f0c051ac3700f13504a350b285b7774cac80d..58e85a0a4bc8d2e21899bbe444c24249cf5ee22b 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -9,6 +9,7 @@
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ -46,18 +47,17 @@ NetworkStateHelper::~NetworkStateHelper() {}
 
 string16 NetworkStateHelper::GetCurrentNetworkName() const {
   NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler();
-  const NetworkState* network = nsh->ConnectedNetworkByType(
-      NetworkStateHandler::kMatchTypeNonVirtual);
+  const NetworkState* network =
+      nsh->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
   if (network) {
-    if (network->type() == flimflam::kTypeEthernet)
+    if (network->Matches(NetworkTypePattern::Ethernet()))
       return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     return UTF8ToUTF16(network->name());
   }
 
-  network = nsh->ConnectingNetworkByType(
-      NetworkStateHandler::kMatchTypeNonVirtual);
+  network = nsh->ConnectingNetworkByType(NetworkTypePattern::NonVirtual());
   if (network) {
-    if (network->type() == flimflam::kTypeEthernet)
+    if (network->Matches(NetworkTypePattern::Ethernet()))
       return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     return UTF8ToUTF16(network->name());
   }
@@ -67,15 +67,15 @@ string16 NetworkStateHelper::GetCurrentNetworkName() const {
 bool NetworkStateHelper::IsConnected() const {
   chromeos::NetworkStateHandler* nsh =
       chromeos::NetworkHandler::Get()->network_state_handler();
-  return nsh->ConnectedNetworkByType(
-      chromeos::NetworkStateHandler::kMatchTypeDefault) != NULL;
+  return nsh->ConnectedNetworkByType(chromeos::NetworkTypePattern::Default()) !=
+         NULL;
 }
 
 bool NetworkStateHelper::IsConnecting() const {
   chromeos::NetworkStateHandler* nsh =
       chromeos::NetworkHandler::Get()->network_state_handler();
   return nsh->ConnectingNetworkByType(
-      chromeos::NetworkStateHandler::kMatchTypeDefault) != NULL;
+      chromeos::NetworkTypePattern::Default()) != NULL;
 }
 
 }  // namespace login