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

chromeos/dbus/shill_network_client.h

Index: chromeos/dbus/shill_network_client.h
diff --git a/chromeos/dbus/flimflam_network_client.h b/chromeos/dbus/shill_network_client.h
similarity index 74%
rename from chromeos/dbus/flimflam_network_client.h
rename to chromeos/dbus/shill_network_client.h
index d049d1c7206b8cbff26a48e2c4cb52af8b035707..78e1f4c62da7e8367aa4b53e5c58709b6a02431c 100644
--- a/chromeos/dbus/flimflam_network_client.h
+++ b/chromeos/dbus/shill_network_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_NETWORK_CLIENT_H_
-#define CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
+#ifndef CHROMEOS_DBUS_SHILL_NETWORK_CLIENT_H_
+#define CHROMEOS_DBUS_SHILL_NETWORK_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,19 +29,19 @@ class ObjectPath;
 
 namespace chromeos {
 
-// FlimflamNetworkClient is used to communicate with the Flimflam Network
+// ShillNetworkClient is used to communicate with the Shill Network
 // service.  All methods should be called from the origin thread which
 // initializes the DBusThreadManager instance.
-class CHROMEOS_EXPORT FlimflamNetworkClient {
+class CHROMEOS_EXPORT ShillNetworkClient {
  public:
-  typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
+  typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
 
-  virtual ~FlimflamNetworkClient();
+  virtual ~ShillNetworkClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
-  static FlimflamNetworkClient* Create(DBusClientImplementationType type,
+  static ShillNetworkClient* Create(DBusClientImplementationType type,
                                        dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
@@ -69,12 +69,12 @@ class CHROMEOS_EXPORT FlimflamNetworkClient {
 
  protected:
   // Create() should be used instead.
-  FlimflamNetworkClient();
+  ShillNetworkClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FlimflamNetworkClient);
+  DISALLOW_COPY_AND_ASSIGN(ShillNetworkClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FLIMFLAM_NETWORK_CLIENT_H_
+#endif  // CHROMEOS_DBUS_SHILL_NETWORK_CLIENT_H_