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

chromeos/dbus/mock_dbus_thread_manager.h

Index: chromeos/dbus/mock_dbus_thread_manager.h
diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h
index 29ca5eeb574afd36409f19b98bc57ec4ac4c20c3..10c9907c605de0d931a7e5b28dc51872890fa314 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.h
+++ b/chromeos/dbus/mock_dbus_thread_manager.h
@@ -28,12 +28,12 @@ class MockCashewClient;
 class MockCrosDisksClient;
 class MockCryptohomeClient;
 class MockDebugDaemonClient;
-class MockFlimflamDeviceClient;
-class MockFlimflamIPConfigClient;
-class MockFlimflamManagerClient;
-class MockFlimflamNetworkClient;
-class MockFlimflamProfileClient;
-class MockFlimflamServiceClient;
+class MockShillDeviceClient;
+class MockShillIPConfigClient;
+class MockShillManagerClient;
+class MockShillNetworkClient;
+class MockShillProfileClient;
+class MockShillServiceClient;
 class MockGsmSMSClient;
 class MockImageBurnerClient;
 class MockIntrospectableClient;
@@ -67,12 +67,12 @@ class MockDBusThreadManager : public DBusThreadManager {
   MOCK_METHOD0(GetCrosDisksClient, CrosDisksClient*(void));
   MOCK_METHOD0(GetCryptohomeClient, CryptohomeClient*(void));
   MOCK_METHOD0(GetDebugDaemonClient, DebugDaemonClient*(void));
-  MOCK_METHOD0(GetFlimflamDeviceClient, FlimflamDeviceClient*(void));
-  MOCK_METHOD0(GetFlimflamIPConfigClient, FlimflamIPConfigClient*(void));
-  MOCK_METHOD0(GetFlimflamManagerClient, FlimflamManagerClient*(void));
-  MOCK_METHOD0(GetFlimflamNetworkClient, FlimflamNetworkClient*(void));
-  MOCK_METHOD0(GetFlimflamProfileClient, FlimflamProfileClient*(void));
-  MOCK_METHOD0(GetFlimflamServiceClient, FlimflamServiceClient*(void));
+  MOCK_METHOD0(GetShillDeviceClient, ShillDeviceClient*(void));
+  MOCK_METHOD0(GetShillIPConfigClient, ShillIPConfigClient*(void));
+  MOCK_METHOD0(GetShillManagerClient, ShillManagerClient*(void));
+  MOCK_METHOD0(GetShillNetworkClient, ShillNetworkClient*(void));
+  MOCK_METHOD0(GetShillProfileClient, ShillProfileClient*(void));
+  MOCK_METHOD0(GetShillServiceClient, ShillServiceClient*(void));
   MOCK_METHOD0(GetGsmSMSClient, GsmSMSClient*(void));
   MOCK_METHOD0(GetImageBurnerClient, ImageBurnerClient*(void));
   MOCK_METHOD0(GetIntrospectableClient, IntrospectableClient*(void));
@@ -123,23 +123,23 @@ class MockDBusThreadManager : public DBusThreadManager {
   MockDebugDaemonClient* mock_debugdaemon_client() {
     return mock_debugdaemon_client_.get();
   }
-  MockFlimflamDeviceClient* mock_flimflam_device_client() {
-    return mock_flimflam_device_client_.get();
+  MockShillDeviceClient* mock_shill_device_client() {
+    return mock_shill_device_client_.get();
   }
-  MockFlimflamIPConfigClient* mock_flimflam_ipconfig_client() {
-    return mock_flimflam_ipconfig_client_.get();
+  MockShillIPConfigClient* mock_shill_ipconfig_client() {
+    return mock_shill_ipconfig_client_.get();
   }
-  MockFlimflamManagerClient* mock_flimflam_manager_client() {
-    return mock_flimflam_manager_client_.get();
+  MockShillManagerClient* mock_shill_manager_client() {
+    return mock_shill_manager_client_.get();
   }
-  MockFlimflamNetworkClient* mock_flimflam_network_client() {
-    return mock_flimflam_network_client_.get();
+  MockShillNetworkClient* mock_shill_network_client() {
+    return mock_shill_network_client_.get();
   }
-  MockFlimflamProfileClient* mock_flimflam_profile_client() {
-    return mock_flimflam_profile_client_.get();
+  MockShillProfileClient* mock_shill_profile_client() {
+    return mock_shill_profile_client_.get();
   }
-  MockFlimflamServiceClient* mock_flimflam_service_client() {
-    return mock_flimflam_service_client_.get();
+  MockShillServiceClient* mock_shill_service_client() {
+    return mock_shill_service_client_.get();
   }
   MockGsmSMSClient* mock_gsm_sms_client() {
     return mock_gsm_sms_client_.get();
@@ -187,12 +187,12 @@ class MockDBusThreadManager : public DBusThreadManager {
   scoped_ptr<MockCrosDisksClient> mock_cros_disks_client_;
   scoped_ptr<MockCryptohomeClient> mock_cryptohome_client_;
   scoped_ptr<MockDebugDaemonClient> mock_debugdaemon_client_;
-  scoped_ptr<MockFlimflamDeviceClient> mock_flimflam_device_client_;
-  scoped_ptr<MockFlimflamIPConfigClient> mock_flimflam_ipconfig_client_;
-  scoped_ptr<MockFlimflamManagerClient> mock_flimflam_manager_client_;
-  scoped_ptr<MockFlimflamNetworkClient> mock_flimflam_network_client_;
-  scoped_ptr<MockFlimflamProfileClient> mock_flimflam_profile_client_;
-  scoped_ptr<MockFlimflamServiceClient> mock_flimflam_service_client_;
+  scoped_ptr<MockShillDeviceClient> mock_shill_device_client_;
+  scoped_ptr<MockShillIPConfigClient> mock_shill_ipconfig_client_;
+  scoped_ptr<MockShillManagerClient> mock_shill_manager_client_;
+  scoped_ptr<MockShillNetworkClient> mock_shill_network_client_;
+  scoped_ptr<MockShillProfileClient> mock_shill_profile_client_;
+  scoped_ptr<MockShillServiceClient> mock_shill_service_client_;
   scoped_ptr<MockGsmSMSClient> mock_gsm_sms_client_;
   scoped_ptr<MockImageBurnerClient> mock_image_burner_client_;
   scoped_ptr<MockIntrospectableClient> mock_introspectable_client_;