Cleanup network type matching.

chrome/browser/ui/webui/chromeos/sim_unlock_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/sim_unlock_ui.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.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/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.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"
@@ skipping 318 matching lines @@
   callback.Run(base::RefCountedString::TakeString(&full_html));
 }
 
 // SimUnlockHandler ------------------------------------------------------------
 
 SimUnlockHandler::SimUnlockHandler()
     : state_(SIM_UNLOCK_LOADING),
       dialog_mode_(SimDialogDelegate::SIM_DIALOG_UNLOCK),
       pending_pin_operation_(false),
       weak_ptr_factory_(this) {
-  if (GetNetworkStateHandler()->GetTechnologyState(flimflam::kTypeCellular)
-      != NetworkStateHandler::TECHNOLOGY_UNAVAILABLE)
+  if (GetNetworkStateHandler()
+          ->GetTechnologyState(NetworkTypePattern::Cellular()) !=
+      NetworkStateHandler::TECHNOLOGY_UNAVAILABLE)
     GetNetworkStateHandler()->AddObserver(this, FROM_HERE);
 }
 
 SimUnlockHandler::~SimUnlockHandler() {
   GetNetworkStateHandler()->RemoveObserver(this, FROM_HERE);
 }
 
 void SimUnlockHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(kJsApiCancel,
       base::Bind(&SimUnlockHandler::HandleCancel,
@@ skipping 321 matching lines @@
   scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr());
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&TaskProxy::HandleInitialize, task.get()));
 }
 
 void SimUnlockHandler::InitializeSimStatus() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // TODO(armansito): For now, we're initializing the device path to the first
   // available cellular device. We should try to obtain a specific device here,
   // as there can be multiple cellular devices present.
-  const DeviceState* cellular_device = GetNetworkStateHandler()->
-      GetDeviceStateByType(flimflam::kTypeCellular);
+  const DeviceState* cellular_device =
+      GetNetworkStateHandler()
+          ->GetDeviceStateByType(NetworkTypePattern::Cellular());
   if (cellular_device) {
     cellular_device_path_ = cellular_device->path();
     sim_lock_type_ = cellular_device->sim_lock_type();
   }
   ProcessSimCardState(cellular_device);
 }
 
 void SimUnlockHandler::ProceedToPukInput() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ProcessSimCardState(GetCellularDevice());
@@ skipping 106 matching lines @@
   SimUnlockHandler* handler = new SimUnlockHandler();
   web_ui->AddMessageHandler(handler);
   SimUnlockUIHTMLSource* html_source = new SimUnlockUIHTMLSource();
 
   // Set up the chrome://sim-unlock/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 }
 
 }  // namespace chromeos