Cleanup network type matching.

chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index f0eb6ecff9e5770039857846f64aa80eaca1c794..c79d5bde7775d4d63d0408ded6cce56853f5aff2 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -438,7 +438,7 @@ NetworkInfoDictionary::NetworkInfoDictionary(const NetworkState* network,
       shared_(false),
       activation_state_(network->activation_state()),
       policy_managed_(network->IsManaged()) {
-  if (network->type() == flimflam::kTypeEthernet)
+  if (network->IsTypeEthernet())
     name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork(
       network, ash::network_icon::ICON_TYPE_LIST);
@@ -456,7 +456,7 @@ NetworkInfoDictionary::NetworkInfoDictionary(const FavoriteState* favorite,
       remembered_(true),
       shared_(!favorite->IsPrivate()),
       policy_managed_(favorite->IsManaged()) {
-  if (favorite->type() == flimflam::kTypeEthernet)
+  if (favorite->IsTypeEthernet())
     name_ = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   gfx::ImageSkia icon = ash::network_icon::GetImageForDisconnectedNetwork(
       ash::network_icon::ICON_TYPE_LIST, favorite->type());
@@ -1535,10 +1535,10 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback(
   dictionary.SetBoolean(kTagShowProxy, !network->profile_path().empty());
 
   // Enable static ip config for ethernet. For wifi, enable if flag is set.
-  bool staticIPConfig = type == flimflam::kTypeEthernet ||
-      (type == flimflam::kTypeWifi &&
-       CommandLine::ForCurrentProcess()->HasSwitch(
-           chromeos::switches::kEnableStaticIPConfig));
+  bool staticIPConfig = network->IsTypeEthernet() ||
+                        (type == flimflam::kTypeWifi &&
+                         CommandLine::ForCurrentProcess()->HasSwitch(
+                             chromeos::switches::kEnableStaticIPConfig));
   dictionary.SetBoolean(kTagShowStaticIPConfig, staticIPConfig);
 
   dictionary.SetBoolean(kTagShowPreferred, !network->profile_path().empty());