Migrate DBus service constants from flimflam namespace to shill namespace.

chromeos/network/network_profile_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/network_profile_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 57 matching lines @@
 
 void NetworkProfileHandler::GetManagerPropertiesCallback(
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
   if (DBUS_METHOD_CALL_FAILURE) {
     LOG(ERROR) << "Error when requesting manager properties.";
     return;
   }
 
   const base::Value* profiles = NULL;
-  properties.GetWithoutPathExpansion(flimflam::kProfilesProperty, &profiles);
+  properties.GetWithoutPathExpansion(shill::kProfilesProperty, &profiles);
   if (!profiles) {
     LOG(ERROR) << "Manager properties returned from Shill don't contain "
-               << "the field " << flimflam::kProfilesProperty;
+               << "the field " << shill::kProfilesProperty;
     return;
   }
-  OnPropertyChanged(flimflam::kProfilesProperty, *profiles);
+  OnPropertyChanged(shill::kProfilesProperty, *profiles);
 }
 
 void NetworkProfileHandler::OnPropertyChanged(const std::string& name,
                                               const base::Value& value) {
-  if (name != flimflam::kProfilesProperty)
+  if (name != shill::kProfilesProperty)
     return;
 
   const base::ListValue* profiles_value = NULL;
   value.GetAsList(&profiles_value);
   DCHECK(profiles_value);
 
   std::vector<std::string> new_profile_paths;
   bool result = ConvertListValueToStringVector(*profiles_value,
                                                &new_profile_paths);
   DCHECK(result);
@@ skipping 34 matching lines @@
   // When the profile list changes, ServiceCompleteList may also change, so
   // trigger a Manager update to request the updated list.
   if (network_state_handler_)
     network_state_handler_->UpdateManagerProperties();
 }
 
 void NetworkProfileHandler::GetProfilePropertiesCallback(
     const std::string& profile_path,
     const base::DictionaryValue& properties) {
   std::string userhash;
-  properties.GetStringWithoutPathExpansion(shill::kUserHashProperty,
-                                           &userhash);
+  properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, &userhash);
 
   AddProfile(NetworkProfile(profile_path, userhash));
 }
 
 void NetworkProfileHandler::AddProfile(const NetworkProfile& profile) {
   VLOG(2) << "Adding profile " << profile.ToDebugString() << ".";
   profiles_.push_back(profile);
   FOR_EACH_OBSERVER(NetworkProfileObserver, observers_,
                     OnProfileAdded(profiles_.back()));
 }
@@ skipping 58 matching lines @@
       base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 NetworkProfileHandler::~NetworkProfileHandler() {
   DBusThreadManager::Get()->GetShillManagerClient()->
       RemovePropertyChangedObserver(this);
 }
 
 }  // namespace chromeos