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

chromeos/dbus/mock_dbus_thread_manager_without_gmock.h

Index: chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
index a2d7127515e86e40e82db72e1dee278875b16865..8d5464657a86103b8296c9e3e2eec60fb7b5419e 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -43,12 +43,12 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE;
   virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE;
   virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE;
-  virtual FlimflamDeviceClient* GetFlimflamDeviceClient() OVERRIDE;
-  virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE;
-  virtual FlimflamManagerClient* GetFlimflamManagerClient() OVERRIDE;
-  virtual FlimflamNetworkClient* GetFlimflamNetworkClient() OVERRIDE;
-  virtual FlimflamProfileClient* GetFlimflamProfileClient() OVERRIDE;
-  virtual FlimflamServiceClient* GetFlimflamServiceClient() OVERRIDE;
+  virtual ShillDeviceClient* GetShillDeviceClient() OVERRIDE;
+  virtual ShillIPConfigClient* GetShillIPConfigClient() OVERRIDE;
+  virtual ShillManagerClient* GetShillManagerClient() OVERRIDE;
+  virtual ShillNetworkClient* GetShillNetworkClient() OVERRIDE;
+  virtual ShillProfileClient* GetShillProfileClient() OVERRIDE;
+  virtual ShillServiceClient* GetShillServiceClient() OVERRIDE;
   virtual GsmSMSClient* GetGsmSMSClient() OVERRIDE;
   virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE;
   virtual IntrospectableClient* GetIntrospectableClient() OVERRIDE;