Cleanup network type matching.

chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.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/ui/webui/chromeos/choose_mobile_network_ui.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_device_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
+#include "chromeos/network/shill_property_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_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"
 
@@ skipping 81 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChooseMobileNetworkHandler);
 };
 
 // ChooseMobileNetworkHandler implementation.
 
 ChooseMobileNetworkHandler::ChooseMobileNetworkHandler()
     : is_page_ready_(false),
       has_pending_results_(false) {
   NetworkStateHandler* handler = GetNetworkStateHandler();
-  const DeviceState* cellular = handler->GetDeviceStateByType(
-      flimflam::kTypeCellular);
+  const DeviceState* cellular =
+      handler->GetDeviceStateByType(NetworkTypePattern::Cellular());
   if (!cellular) {
     NET_LOG_ERROR(
         "A cellular device is not available.",
         "Cannot initiate a cellular network scan without a cellular device.");
     return;
   }
   handler->AddObserver(this, FROM_HERE);
   device_path_ = cellular->path();
   GetNetworkDeviceHandler()->ProposeScan(
       device_path_,
@@ skipping 115 matching lines @@
     : WebUIController(web_ui) {
   ChooseMobileNetworkHandler* handler = new ChooseMobileNetworkHandler();
   web_ui->AddMessageHandler(handler);
   // Set up the "chrome://choose-mobile-network" source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(
       profile, CreateChooseMobileNetworkUIHTMLSource());
 }
 
 }  // namespace chromeos