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

chromeos/dbus/mock_shill_manager_client.h

Index: chromeos/dbus/mock_shill_manager_client.h
diff --git a/chromeos/dbus/mock_flimflam_manager_client.h b/chromeos/dbus/mock_shill_manager_client.h
similarity index 81%
rename from chromeos/dbus/mock_flimflam_manager_client.h
rename to chromeos/dbus/mock_shill_manager_client.h
index d76a7b73fd833efcd64986267d9eefeb031a2188..d38dd0324001d16be886f38086f54b1bb352e9c9 100644
--- a/chromeos/dbus/mock_flimflam_manager_client.h
+++ b/chromeos/dbus/mock_shill_manager_client.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_MANAGER_CLIENT_H_
-#define CHROMEOS_DBUS_MOCK_FLIMFLAM_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_SHILL_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_SHILL_MANAGER_CLIENT_H_
 
 #include "base/values.h"
-#include "chromeos/dbus/flimflam_manager_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
-class MockFlimflamManagerClient : public FlimflamManagerClient {
+class MockShillManagerClient : public ShillManagerClient {
  public:
-  MockFlimflamManagerClient();
-  virtual ~MockFlimflamManagerClient();
+  MockShillManagerClient();
+  virtual ~MockShillManagerClient();
 
   MOCK_METHOD1(SetPropertyChangedHandler, void(
       const PropertyChangedHandler& handler));
@@ -38,4 +38,4 @@ class MockFlimflamManagerClient : public FlimflamManagerClient {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_MOCK_FLIMFLAM_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_SHILL_MANAGER_CLIENT_H_