Renaming instances of "flimflam" with "shill", now that we're only

chromeos/dbus/shill_client_helper.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 "chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/dbus/shill_client_helper.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
-FlimflamClientHelper::FlimflamClientHelper(dbus::Bus* bus,
+ShillClientHelper::ShillClientHelper(dbus::Bus* bus,
                                            dbus::ObjectProxy* proxy)
     : blocking_method_caller_(bus, proxy),
       proxy_(proxy),
       weak_ptr_factory_(this) {
 }
 
-FlimflamClientHelper::~FlimflamClientHelper() {
+ShillClientHelper::~ShillClientHelper() {
 }
 
-void FlimflamClientHelper::SetPropertyChangedHandler(
+void ShillClientHelper::SetPropertyChangedHandler(
     const PropertyChangedHandler& handler) {
   property_changed_handler_ = handler;
 }
 
-void FlimflamClientHelper::ResetPropertyChangedHandler() {
+void ShillClientHelper::ResetPropertyChangedHandler() {
   property_changed_handler_.Reset();
 }
 
-void FlimflamClientHelper::MonitorPropertyChanged(
+void ShillClientHelper::MonitorPropertyChanged(
     const std::string& interface_name) {
   // We are not using dbus::PropertySet to monitor PropertyChanged signal
   // because the interface is not "org.freedesktop.DBus.Properties".
   proxy_->ConnectToSignal(interface_name,
                           flimflam::kMonitorPropertyChanged,
-                          base::Bind(&FlimflamClientHelper::OnPropertyChanged,
+                          base::Bind(&ShillClientHelper::OnPropertyChanged,
                                      weak_ptr_factory_.GetWeakPtr()),
-                          base::Bind(&FlimflamClientHelper::OnSignalConnected,
+                          base::Bind(&ShillClientHelper::OnSignalConnected,
                                      weak_ptr_factory_.GetWeakPtr()));
 }
 
-void FlimflamClientHelper::CallVoidMethod(
+void ShillClientHelper::CallVoidMethod(
     dbus::MethodCall* method_call,
     const VoidDBusMethodCallback& callback) {
   proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                     base::Bind(&FlimflamClientHelper::OnVoidMethod,
+                     base::Bind(&ShillClientHelper::OnVoidMethod,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 callback));
 }
 
-void FlimflamClientHelper::CallObjectPathMethod(
+void ShillClientHelper::CallObjectPathMethod(
     dbus::MethodCall* method_call,
     const ObjectPathDBusMethodCallback& callback) {
   proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                     base::Bind(&FlimflamClientHelper::OnObjectPathMethod,
+                     base::Bind(&ShillClientHelper::OnObjectPathMethod,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 callback));
 }
 
-void FlimflamClientHelper::CallDictionaryValueMethod(
+void ShillClientHelper::CallDictionaryValueMethod(
     dbus::MethodCall* method_call,
     const DictionaryValueCallback& callback) {
   proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                     base::Bind(&FlimflamClientHelper::OnDictionaryValueMethod,
+                     base::Bind(&ShillClientHelper::OnDictionaryValueMethod,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 callback));
 }
 
-void FlimflamClientHelper::CallVoidMethodWithErrorCallback(
+void ShillClientHelper::CallVoidMethodWithErrorCallback(
     dbus::MethodCall* method_call,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   proxy_->CallMethodWithErrorCallback(
       method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-      base::Bind(&FlimflamClientHelper::OnVoidMethodWithErrorCallback,
+      base::Bind(&ShillClientHelper::OnVoidMethodWithErrorCallback,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback),
-      base::Bind(&FlimflamClientHelper::OnError,
+      base::Bind(&ShillClientHelper::OnError,
                  weak_ptr_factory_.GetWeakPtr(),
                  error_callback));
 }
 
-void FlimflamClientHelper::CallDictionaryValueMethodWithErrorCallback(
+void ShillClientHelper::CallDictionaryValueMethodWithErrorCallback(
     dbus::MethodCall* method_call,
     const DictionaryValueCallbackWithoutStatus& callback,
     const ErrorCallback& error_callback) {
   proxy_->CallMethodWithErrorCallback(
       method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
       base::Bind(
-          &FlimflamClientHelper::OnDictionaryValueMethodWithErrorCallback,
+          &ShillClientHelper::OnDictionaryValueMethodWithErrorCallback,
           weak_ptr_factory_.GetWeakPtr(),
           callback,
           error_callback),
-      base::Bind(&FlimflamClientHelper::OnError,
+      base::Bind(&ShillClientHelper::OnError,
                  weak_ptr_factory_.GetWeakPtr(),
                  error_callback));
 }
 
-bool FlimflamClientHelper::CallVoidMethodAndBlock(
+bool ShillClientHelper::CallVoidMethodAndBlock(
     dbus::MethodCall* method_call) {
   scoped_ptr<dbus::Response> response(
       blocking_method_caller_.CallMethodAndBlock(method_call));
   if (!response.get())
     return false;
   return true;
 }
 
-dbus::ObjectPath FlimflamClientHelper::CallObjectPathMethodAndBlock(
+dbus::ObjectPath ShillClientHelper::CallObjectPathMethodAndBlock(
     dbus::MethodCall* method_call) {
   scoped_ptr<dbus::Response> response(
       blocking_method_caller_.CallMethodAndBlock(method_call));
   if (!response.get())
     return dbus::ObjectPath();
 
   dbus::MessageReader reader(response.get());
   dbus::ObjectPath result;
   if (!reader.PopObjectPath(&result))
     return dbus::ObjectPath();
 
   return result;
 }
 
-base::DictionaryValue* FlimflamClientHelper::CallDictionaryValueMethodAndBlock(
+base::DictionaryValue* ShillClientHelper::CallDictionaryValueMethodAndBlock(
     dbus::MethodCall* method_call) {
   scoped_ptr<dbus::Response> response(
       blocking_method_caller_.CallMethodAndBlock(method_call));
   if (!response.get())
     return NULL;
 
   dbus::MessageReader reader(response.get());
   base::Value* value = dbus::PopDataAsValue(&reader);
   base::DictionaryValue* result = NULL;
   if (!value || !value->GetAsDictionary(&result)) {
     delete value;
     return NULL;
   }
   return result;
 }
 
 // static
-void FlimflamClientHelper::AppendValueDataAsVariant(dbus::MessageWriter* writer,
+void ShillClientHelper::AppendValueDataAsVariant(dbus::MessageWriter* writer,
                                                     const base::Value& value) {
   // Support basic types and string-to-string dictionary.
   switch (value.GetType()) {
     case base::Value::TYPE_DICTIONARY: {
       const base::DictionaryValue* dictionary = NULL;
       value.GetAsDictionary(&dictionary);
       dbus::MessageWriter variant_writer(NULL);
       writer->OpenVariant("a{ss}", &variant_writer);
       dbus::MessageWriter array_writer(NULL);
       variant_writer.OpenArray("{ss}", &array_writer);
@@ skipping 20 matching lines @@
     case base::Value::TYPE_DOUBLE:
     case base::Value::TYPE_STRING:
       dbus::AppendBasicTypeValueDataAsVariant(writer, value);
       break;
     default:
       DLOG(ERROR) << "Unexpected type " << value.GetType();
   }
 
 }
 
-void FlimflamClientHelper::OnSignalConnected(const std::string& interface,
+void ShillClientHelper::OnSignalConnected(const std::string& interface,
                                              const std::string& signal,
                                              bool success) {
   LOG_IF(ERROR, !success) << "Connect to " << interface << " " << signal
                           << " failed.";
 }
 
-void FlimflamClientHelper::OnPropertyChanged(dbus::Signal* signal) {
+void ShillClientHelper::OnPropertyChanged(dbus::Signal* signal) {
   if (property_changed_handler_.is_null())
     return;
 
   dbus::MessageReader reader(signal);
   std::string name;
   if (!reader.PopString(&name))
     return;
   scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
   if (!value.get())
     return;
   property_changed_handler_.Run(name, *value);
 }
 
-void FlimflamClientHelper::OnVoidMethod(const VoidDBusMethodCallback& callback,
+void ShillClientHelper::OnVoidMethod(const VoidDBusMethodCallback& callback,
                                         dbus::Response* response) {
   if (!response) {
     callback.Run(DBUS_METHOD_CALL_FAILURE);
     return;
   }
   callback.Run(DBUS_METHOD_CALL_SUCCESS);
 }
 
-void FlimflamClientHelper::OnObjectPathMethod(
+void ShillClientHelper::OnObjectPathMethod(
     const ObjectPathDBusMethodCallback& callback,
     dbus::Response* response) {
   if (!response) {
     callback.Run(DBUS_METHOD_CALL_FAILURE, dbus::ObjectPath());
     return;
   }
   dbus::MessageReader reader(response);
   dbus::ObjectPath result;
   if (!reader.PopObjectPath(&result)) {
     callback.Run(DBUS_METHOD_CALL_FAILURE, dbus::ObjectPath());
     return;
   }
   callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
 }
 
-void FlimflamClientHelper::OnDictionaryValueMethod(
+void ShillClientHelper::OnDictionaryValueMethod(
     const DictionaryValueCallback& callback,
     dbus::Response* response) {
   if (!response) {
     base::DictionaryValue result;
     callback.Run(DBUS_METHOD_CALL_FAILURE, result);
     return;
   }
   dbus::MessageReader reader(response);
   scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
   base::DictionaryValue* result = NULL;
   if (!value.get() || !value->GetAsDictionary(&result)) {
     base::DictionaryValue result;
     callback.Run(DBUS_METHOD_CALL_FAILURE, result);
     return;
   }
   callback.Run(DBUS_METHOD_CALL_SUCCESS, *result);
 }
 
-void FlimflamClientHelper::OnVoidMethodWithErrorCallback(
+void ShillClientHelper::OnVoidMethodWithErrorCallback(
     const base::Closure& callback,
     dbus::Response* response) {
   callback.Run();
 }
 
-void FlimflamClientHelper::OnDictionaryValueMethodWithErrorCallback(
+void ShillClientHelper::OnDictionaryValueMethodWithErrorCallback(
     const DictionaryValueCallbackWithoutStatus& callback,
     const ErrorCallback& error_callback,
     dbus::Response* response) {
   dbus::MessageReader reader(response);
   scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
   base::DictionaryValue* result = NULL;
   if (!value.get() || !value->GetAsDictionary(&result)) {
     const std::string error_name;  // No error name.
     const std::string error_message = "Invalid response.";
     error_callback.Run(error_name, error_message);
     return;
   }
   callback.Run(*result);
 }
 
-void FlimflamClientHelper::OnError(const ErrorCallback& error_callback,
+void ShillClientHelper::OnError(const ErrorCallback& error_callback,
                                    dbus::ErrorResponse* response) {
   std::string error_name;
   std::string error_message;
   if (response) {
     // Error message may contain the error message as string.
     dbus::MessageReader reader(response);
     error_name = response->GetErrorName();
     reader.PopString(&error_message);
   }
   error_callback.Run(error_name, error_message);
 }
 
 }  // namespace chromeos