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

chromeos/dbus/mock_shill_service_client.h

Index: chromeos/dbus/mock_shill_service_client.h
diff --git a/chromeos/dbus/mock_flimflam_service_client.h b/chromeos/dbus/mock_shill_service_client.h
similarity index 85%
rename from chromeos/dbus/mock_flimflam_service_client.h
rename to chromeos/dbus/mock_shill_service_client.h
index 8bc0a6ee5c10407972547da8817497c8a8b47010..1b3c61e11052b3b4897a13c44dbeddd773fbca84 100644
--- a/chromeos/dbus/mock_flimflam_service_client.h
+++ b/chromeos/dbus/mock_shill_service_client.h
@@ -2,20 +2,20 @@
 // 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_SERVICE_CLIENT_H_
-#define CHROMEOS_DBUS_MOCK_FLIMFLAM_SERVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_SHILL_SERVICE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_SHILL_SERVICE_CLIENT_H_
 
 #include "base/values.h"
-#include "chromeos/dbus/flimflam_service_client.h"
+#include "chromeos/dbus/shill_service_client.h"
 #include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
-class MockFlimflamServiceClient : public FlimflamServiceClient {
+class MockShillServiceClient : public ShillServiceClient {
  public:
-  MockFlimflamServiceClient();
-  virtual ~MockFlimflamServiceClient();
+  MockShillServiceClient();
+  virtual ~MockShillServiceClient();
 
   MOCK_METHOD2(SetPropertyChangedHandler,
                void(const dbus::ObjectPath& service_path,
@@ -49,4 +49,4 @@ class MockFlimflamServiceClient : public FlimflamServiceClient {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_MOCK_FLIMFLAM_SERVICE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_MOCK_SHILL_SERVICE_CLIENT_H_