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"
@@ skipping 31 matching lines @@
 namespace login {
 
 NetworkStateHelper::NetworkStateHelper() {}
 NetworkStateHelper::~NetworkStateHelper() {}
 
 string16 NetworkStateHelper::GetCurrentNetworkName() const {
   NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler();
   const NetworkState* network = nsh->ConnectedNetworkByType(
       NetworkStateHandler::kMatchTypeNonVirtual);
   if (network) {
-    if (network->type() == flimflam::kTypeEthernet)
+    if (network->IsTypeEthernet())
       return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     return UTF8ToUTF16(network->name());
   }
 
   network = nsh->ConnectingNetworkByType(
       NetworkStateHandler::kMatchTypeNonVirtual);
   if (network) {
-    if (network->type() == flimflam::kTypeEthernet)
+    if (network->IsTypeEthernet())
       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;
 }
 
 bool NetworkStateHelper::IsConnecting() const {
   chromeos::NetworkStateHandler* nsh =
       chromeos::NetworkHandler::Get()->network_state_handler();
   return nsh->ConnectingNetworkByType(
       chromeos::NetworkStateHandler::kMatchTypeDefault) != NULL;
 }
 
 }  // namespace login
 
 }  // namespace chromeos