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

chromeos/dbus/shill_client_helper.h

 // 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.
 
-#ifndef CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
-#define CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
+#ifndef CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
+#define CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/dbus/blocking_method_caller.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 
 namespace base {
@@ skipping 11 matching lines @@
 class MethodCall;
 class ObjectPath;
 class ObjectProxy;
 class Response;
 class Signal;
 
 }  // namespace dbus
 
 namespace chromeos {
 
-// A class to help implement Flimflam clients.
-class FlimflamClientHelper {
+// A class to help implement Shill clients.
+class ShillClientHelper {
  public:
   // A callback to handle PropertyChanged signals.
   typedef base::Callback<void(const std::string& name,
                               const base::Value& value)> PropertyChangedHandler;
 
   // A callback to handle responses for methods with DictionaryValue results.
   typedef base::Callback<void(
       DBusMethodCallStatus call_status,
       const base::DictionaryValue& result)> DictionaryValueCallback;
 
   // A callback to handle responses for methods with DictionaryValue reuslts.
   // This is used by CallDictionaryValueMethodWithErrorCallback.
   typedef base::Callback<void(const base::DictionaryValue& result
                               )> DictionaryValueCallbackWithoutStatus;
 
   // A callback to handle erros for method call.
   typedef base::Callback<void(const std::string& error_name,
                               const std::string& error_message)> ErrorCallback;
 
-  FlimflamClientHelper(dbus::Bus* bus, dbus::ObjectProxy* proxy);
+  ShillClientHelper(dbus::Bus* bus, dbus::ObjectProxy* proxy);
 
-  virtual ~FlimflamClientHelper();
+  virtual ~ShillClientHelper();
 
   // Sets PropertyChanged signal handler.
   void SetPropertyChangedHandler(const PropertyChangedHandler& handler);
 
   // Resets PropertyChanged signal handler.
   void ResetPropertyChangedHandler();
 
   // Starts monitoring PropertyChanged signal.
   void MonitorPropertyChanged(const std::string& interface_name);
 
@@ skipping 74 matching lines @@
   void OnError(const ErrorCallback& error_callback,
                dbus::ErrorResponse* response);
 
   // TODO(hashimoto): Remove this when we no longer need to make blocking calls.
   BlockingMethodCaller blocking_method_caller_;
   dbus::ObjectProxy* proxy_;
   PropertyChangedHandler property_changed_handler_;
 
   // 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<FlimflamClientHelper> weak_ptr_factory_;
+  base::WeakPtrFactory<ShillClientHelper> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(FlimflamClientHelper);
+  DISALLOW_COPY_AND_ASSIGN(ShillClientHelper);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FLIMFLAM_CLIENT_HELPER_H_
+#endif  // CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_