Cleanup network type matching.

chrome/browser/chromeos/system/ash_system_tray_delegate.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/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 81 matching lines @@
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 109 matching lines @@
   // TODO(sad): Do something?
 }
 
 void ShowNetworkSettingsPage(const std::string& service_path) {
   std::string page = chrome::kInternetOptionsSubPage;
   const NetworkState* network = service_path.empty() ? NULL :
       NetworkHandler::Get()->network_state_handler()->GetNetworkState(
           service_path);
   if (network) {
     std::string name(network->name());
-    if (name.empty() && network->type() == flimflam::kTypeEthernet)
+    if (name.empty() && network->Matches(NetworkTypePattern::Ethernet()))
       name = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
     page += base::StringPrintf(
         "?servicePath=%s&networkType=%s&networkName=%s",
         net::EscapeUrlEncodedData(service_path, true).c_str(),
         net::EscapeUrlEncodedData(network->type(), true).c_str(),
         net::EscapeUrlEncodedData(name, false).c_str());
   }
   content::RecordAction(
       content::UserMetricsAction("OpenInternetOptionsDialog"));
   Browser* browser = chrome::FindOrCreateTabbedBrowser(
@@ skipping 1095 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos