Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/geolocation_handler.cc

 // Copyright (c) 2013 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 "chromeos/network/geolocation_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 46 matching lines @@
   HandlePropertyChanged(key, value);
 }
 
 //------------------------------------------------------------------------------
 // Private methods
 
 void GeolocationHandler::ManagerPropertiesCallback(
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
   const base::Value* value = NULL;
-  if (properties.Get(flimflam::kEnabledTechnologiesProperty, &value) && value)
-    HandlePropertyChanged(flimflam::kEnabledTechnologiesProperty, *value);
+  if (properties.Get(shill::kEnabledTechnologiesProperty, &value) && value)
+    HandlePropertyChanged(shill::kEnabledTechnologiesProperty, *value);
 }
 
 void GeolocationHandler::HandlePropertyChanged(const std::string& key,
                                                const base::Value& value) {
-  if (key != flimflam::kEnabledTechnologiesProperty)
+  if (key != shill::kEnabledTechnologiesProperty)
     return;
   const base::ListValue* technologies = NULL;
   if (!value.GetAsList(&technologies) || !technologies)
     return;
   bool wifi_was_enabled = wifi_enabled_;
   wifi_enabled_ = false;
   for (base::ListValue::const_iterator iter = technologies->begin();
        iter != technologies->end(); ++iter) {
     std::string technology;
     (*iter)->GetAsString(&technology);
-    if (technology == flimflam::kTypeWifi) {
+    if (technology == shill::kTypeWifi) {
       wifi_enabled_ = true;
       break;
     }
   }
   if (!wifi_was_enabled && wifi_enabled_)
     RequestWifiAccessPoints();  // Request initial location data.
 }
 
 void GeolocationHandler::RequestWifiAccessPoints() {
   DBusThreadManager::Get()->GetShillManagerClient()->GetNetworksForGeolocation(
@@ skipping 47 matching lines @@
       std::string channel_str;
       if (entry->GetString(shill::kGeoChannelProperty, &channel_str))
         base::StringToInt(channel_str, &wap.channel);
       wifi_access_points_.push_back(wap);
     }
   }
   geolocation_received_time_ = base::Time::Now();
 }
 
 }  // namespace chromeos