Cleanup network type matching.

chrome/browser/chromeos/mobile/mobile_activator.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/mobile/mobile_activator.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 17 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_activation_handler.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler_callbacks.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 "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Cellular configuration file path.
 const char kCellularConfigPath[] =
     "/usr/share/chromeos-assets/mobile/mobile_config.json";
@@ skipping 315 matching lines @@
       this, &MobileActivator::HandleOTASPTimeout);
 }
 
 void MobileActivator::StartActivation() {
   UMA_HISTOGRAM_COUNTS("Cellular.MobileSetupStart", 1);
   const NetworkState* network = GetNetworkState(service_path_);
   // Check if we can start activation process.
   if (!network) {
     NetworkStateHandler::TechnologyState technology_state =
         NetworkHandler::Get()->network_state_handler()->GetTechnologyState(
-            flimflam::kTypeCellular);
+            NetworkTypePattern::Cellular());
     std::string error;
     if (technology_state == NetworkStateHandler::TECHNOLOGY_UNAVAILABLE) {
       error = kErrorNoDevice;
     } else if (technology_state != NetworkStateHandler::TECHNOLOGY_ENABLED) {
       error = kErrorDisabled;
     } else {
       error = kErrorNoService;
     }
     ChangeState(NULL, PLAN_ACTIVATION_ERROR, GetErrorMessage(error));
     return;
@@ skipping 635 matching lines @@
   cellular_plan_payment_time_ = base::Time::Now();
 }
 
 bool MobileActivator::HasRecentCellularPlanPayment() const {
   const int kRecentPlanPaymentHours = 6;
   return (base::Time::Now() -
           cellular_plan_payment_time_).InHours() < kRecentPlanPaymentHours;
 }
 
 }  // namespace chromeos