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

chromeos/dbus/shill_ipconfig_client.h

Index: chromeos/dbus/shill_ipconfig_client.h
diff --git a/chromeos/dbus/flimflam_ipconfig_client.h b/chromeos/dbus/shill_ipconfig_client.h
similarity index 82%
rename from chromeos/dbus/flimflam_ipconfig_client.h
rename to chromeos/dbus/shill_ipconfig_client.h
index e3686fa7728894f881ef14ae5e840458b77498b2..c87d829632b536d84ba52a8b89672d5f0bc28e03 100644
--- a/chromeos/dbus/flimflam_ipconfig_client.h
+++ b/chromeos/dbus/shill_ipconfig_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
-#define CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
+#ifndef CHROMEOS_DBUS_SHILL_IPCONFIG_CLIENT_H_
+#define CHROMEOS_DBUS_SHILL_IPCONFIG_CLIENT_H_
 
 #include <string>
 
@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/dbus/shill_client_helper.h"
 
 namespace base {
 
@@ -29,18 +29,18 @@ class ObjectPath;
 
 namespace chromeos {
 
-// FlimflamIPConfigClient is used to communicate with the Flimflam IPConfig
+// ShillIPConfigClient is used to communicate with the Shill IPConfig
 // service.  All methods should be called from the origin thread which
 // initializes the DBusThreadManager instance.
-class CHROMEOS_EXPORT FlimflamIPConfigClient {
+class CHROMEOS_EXPORT ShillIPConfigClient {
  public:
-  typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
-  virtual ~FlimflamIPConfigClient();
+  typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
+  typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  virtual ~ShillIPConfigClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
-  static FlimflamIPConfigClient* Create(DBusClientImplementationType type,
+  static ShillIPConfigClient* Create(DBusClientImplementationType type,
                                         dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
@@ -98,12 +98,12 @@ class CHROMEOS_EXPORT FlimflamIPConfigClient {
 
  protected:
   // Create() should be used instead.
-  FlimflamIPConfigClient();
+  ShillIPConfigClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FlimflamIPConfigClient);
+  DISALLOW_COPY_AND_ASSIGN(ShillIPConfigClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FLIMFLAM_IPCONFIG_CLIENT_H_
+#endif  // CHROMEOS_DBUS_SHILL_IPCONFIG_CLIENT_H_