Cleanup network type matching.

chrome/browser/chromeos/extensions/info_private_api.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/extensions/info_private_api.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chromeos/network/device_state.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 chromeos::NetworkHandler;
 
 namespace extensions {
 
 namespace {
 
 // Key which corresponds to the HWID setting.
 const char kPropertyHWID[] = "hwid";
@@ skipping 38 matching lines @@
     const std::string& property_name) {
   if (property_name == kPropertyHWID) {
     std::string hwid;
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(chromeos::system::kHardwareClass, &hwid);
     return new base::StringValue(hwid);
   } else if (property_name == kPropertyHomeProvider) {
     const chromeos::DeviceState* cellular_device =
         NetworkHandler::Get()->network_state_handler()->GetDeviceStateByType(
-            flimflam::kTypeCellular);
+            chromeos::NetworkTypePattern::Cellular());
     std::string home_provider_id;
     if (cellular_device)
       home_provider_id = cellular_device->home_provider_id();
     return new base::StringValue(home_provider_id);
   } else if (property_name == kPropertyInitialLocale) {
     return new base::StringValue(
         chromeos::StartupUtils::GetInitialLocale());
   } else if (property_name == kPropertyBoard) {
     std::string board;
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(chromeos::system::kMachineInfoBoard, &board);
     return new base::StringValue(board);
   } else if (property_name == kPropertyOwner) {
     return Value::CreateBooleanValue(
         chromeos::UserManager::Get()->IsCurrentUserOwner());
   }
 
   DLOG(ERROR) << "Unknown property request: " << property_name;
   return NULL;
 }
 
 }  // namespace extensions