Cleanup network type matching.

chrome/browser/chromeos/login/helper.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 "chrome/browser/chromeos/login/helper.h"
 
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 
 namespace chromeos {
 
 gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
@@ skipping 17 matching lines @@
       ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
 }
 
 namespace login {
 
 NetworkStateHelper::NetworkStateHelper() {}
 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());
   }
   return string16();
 }
 
 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
 
 }  // namespace chromeos