Cleanup network type matching.

chrome/browser/chromeos/settings/device_settings_provider.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/settings/device_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chromeos/chromeos_switches.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_handler.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using google::protobuf::RepeatedField;
 using google::protobuf::RepeatedPtrField;
 
 namespace em = enterprise_management;
 
 namespace chromeos {
 
 namespace {
@@ skipping 775 matching lines @@
   VLOG(1) << "Metrics policy is being set to : " << new_value
           << "(use file : " << use_file << ")";
   // TODO(pastarmovj): Remove this once we don't need to regenerate the
   // consent file for the GUID anymore.
   OptionsUtil::ResolveMetricsReportingEnabled(new_value);
 }
 
 void DeviceSettingsProvider::ApplyRoamingSetting(bool new_value) {
   // TODO(armansito): Look up the device by explicitly using the device path.
   const DeviceState* cellular =
-      NetworkHandler::Get()->network_state_handler()->
-          GetDeviceStateByType(flimflam::kTypeCellular);
+      NetworkHandler::Get()->network_state_handler()->GetDeviceStateByType(
+          NetworkTypePattern::Cellular());
   if (!cellular) {
     NET_LOG_DEBUG("No cellular device is available",
                   "Roaming is only supported by cellular devices.");
     return;
   }
   bool current_value;
   if (!cellular->properties().GetBooleanWithoutPathExpansion(
           flimflam::kCellularAllowRoamingProperty, &current_value)) {
     NET_LOG_ERROR("Could not get \"allow roaming\" property from cellular "
                   "device.", cellular->path());
@@ skipping 173 matching lines @@
 void DeviceSettingsProvider::AttemptMigration() {
   if (device_settings_service_->HasPrivateOwnerKey()) {
     PrefValueMap::const_iterator i;
     for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
       DoSet(i->first, *i->second);
     migration_values_.Clear();
   }
 }
 
 }  // namespace chromeos