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

chromeos/dbus/shill_manager_client.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_manager_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
@@ skipping 17 matching lines @@
     dbus::MessageWriter* writer,
     const base::DictionaryValue& dictionary) {
   dbus::MessageWriter array_writer(NULL);
   writer->OpenArray("{sv}", &array_writer);
   for (base::DictionaryValue::Iterator it(dictionary);
        it.HasNext();
        it.Advance()) {
     dbus::MessageWriter entry_writer(NULL);
     array_writer.OpenDictEntry(&entry_writer);
     entry_writer.AppendString(it.key());
-    FlimflamClientHelper::AppendValueDataAsVariant(&entry_writer, it.value());
+    ShillClientHelper::AppendValueDataAsVariant(&entry_writer, it.value());
     array_writer.CloseContainer(&entry_writer);
   }
   writer->CloseContainer(&array_writer);
 }
 
-// The FlimflamManagerClient implementation.
-class FlimflamManagerClientImpl : public FlimflamManagerClient {
+// The ShillManagerClient implementation.
+class ShillManagerClientImpl : public ShillManagerClient {
  public:
-  explicit FlimflamManagerClientImpl(dbus::Bus* bus)
+  explicit ShillManagerClientImpl(dbus::Bus* bus)
       : proxy_(bus->GetObjectProxy(
           flimflam::kFlimflamServiceName,
           dbus::ObjectPath(flimflam::kFlimflamServicePath))),
         helper_(bus, proxy_) {
     helper_.MonitorPropertyChanged(flimflam::kFlimflamManagerInterface);
   }
 
-  // FlimflamManagerClient overrides:
+  // ShillManagerClient overrides:
   virtual void SetPropertyChangedHandler(
       const PropertyChangedHandler& handler) OVERRIDE {
     helper_.SetPropertyChangedHandler(handler);
   }
 
   virtual void ResetPropertyChangedHandler() OVERRIDE {
     helper_.ResetPropertyChangedHandler();
   }
 
   virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetPropertiesFunction);
     helper_.CallDictionaryValueMethod(&method_call, callback);
   }
 
   virtual base::DictionaryValue* CallGetPropertiesAndBlock() OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetPropertiesFunction);
     return helper_.CallDictionaryValueMethodAndBlock(&method_call);
   }
 
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
-    FlimflamClientHelper::AppendValueDataAsVariant(&writer, value);
+    ShillClientHelper::AppendValueDataAsVariant(&writer, value);
     helper_.CallVoidMethod(&method_call, callback);
   }
 
   virtual void RequestScan(const std::string& type,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kRequestScanFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(type);
     helper_.CallVoidMethod(&method_call, callback);
@@ skipping 35 matching lines @@
       const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetServiceFunction);
     dbus::MessageWriter writer(&method_call);
     AppendServicePropertiesDictionary(&writer, properties);
     helper_.CallObjectPathMethod(&method_call, callback);
   }
 
  private:
   dbus::ObjectProxy* proxy_;
-  FlimflamClientHelper helper_;
+  ShillClientHelper helper_;
 
-  DISALLOW_COPY_AND_ASSIGN(FlimflamManagerClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(ShillManagerClientImpl);
 };
 
-// A stub implementation of FlimflamManagerClient.
+// A stub implementation of ShillManagerClient.
 // Implemented: Stub cellular DeviceList entry for SMS testing.
-class FlimflamManagerClientStubImpl : public FlimflamManagerClient {
+class ShillManagerClientStubImpl : public ShillManagerClient {
  public:
-  FlimflamManagerClientStubImpl() : weak_ptr_factory_(this) {
+  ShillManagerClientStubImpl() : weak_ptr_factory_(this) {
     base::ListValue* device_list = new base::ListValue;
     // Note: names match Device stub map.
     const char kStubCellular1[] = "stub_cellular1";
     const char kStubCellular2[] = "stub_cellular2";
     device_list->Append(base::Value::CreateStringValue(kStubCellular1));
     device_list->Append(base::Value::CreateStringValue(kStubCellular2));
     stub_properties_.Set(flimflam::kDevicesProperty, device_list);
   }
 
-  virtual ~FlimflamManagerClientStubImpl() {}
+  virtual ~ShillManagerClientStubImpl() {}
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void SetPropertyChangedHandler(
       const PropertyChangedHandler& handler) OVERRIDE {}
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void ResetPropertyChangedHandler() OVERRIDE {}
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(
-            &FlimflamManagerClientStubImpl::PassStubProperties,
+            &ShillManagerClientStubImpl::PassStubProperties,
             weak_ptr_factory_.GetWeakPtr(),
             callback));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual base::DictionaryValue* CallGetPropertiesAndBlock() OVERRIDE {
     return new base::DictionaryValue;
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     stub_properties_.Set(name, value.DeepCopy());
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void RequestScan(const std::string& type,
                            const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void EnableTechnology(
       const std::string& type,
       const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void DisableTechnology(
       const std::string& type,
       const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void ConfigureService(
       const base::DictionaryValue& properties,
       const VoidDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
-  // FlimflamManagerClient override.
+  // ShillManagerClient override.
   virtual void GetService(
       const base::DictionaryValue& properties,
       const ObjectPathDBusMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS,
                                                 dbus::ObjectPath()));
   }
 
  private:
   void PassStubProperties(const DictionaryValueCallback& callback) const {
     callback.Run(DBUS_METHOD_CALL_SUCCESS, stub_properties_);
   }
 
   base::DictionaryValue stub_properties_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<FlimflamManagerClientStubImpl> weak_ptr_factory_;
+  base::WeakPtrFactory<ShillManagerClientStubImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(FlimflamManagerClientStubImpl);
+  DISALLOW_COPY_AND_ASSIGN(ShillManagerClientStubImpl);
 };
 
 }  // namespace
 
-FlimflamManagerClient::FlimflamManagerClient() {}
+ShillManagerClient::ShillManagerClient() {}
 
-FlimflamManagerClient::~FlimflamManagerClient() {}
+ShillManagerClient::~ShillManagerClient() {}
 
 // static
-FlimflamManagerClient* FlimflamManagerClient::Create(
+ShillManagerClient* ShillManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new FlimflamManagerClientImpl(bus);
+    return new ShillManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
-  return new FlimflamManagerClientStubImpl();
+  return new ShillManagerClientStubImpl();
 }
 
 }  // namespace chromeos