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

chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

Index: chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 9a5735911efefa4a656d56e21cfa4aac626870a1..a22e9061b60ebbd0127659dea4618bdd89d96e79 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -83,38 +83,38 @@ DebugDaemonClient* MockDBusThreadManagerWithoutGMock::GetDebugDaemonClient() {
   return NULL;
 }
 
-FlimflamDeviceClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamDeviceClient() {
+ShillDeviceClient*
+    MockDBusThreadManagerWithoutGMock::GetShillDeviceClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-FlimflamIPConfigClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamIPConfigClient() {
+ShillIPConfigClient*
+    MockDBusThreadManagerWithoutGMock::GetShillIPConfigClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-FlimflamManagerClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamManagerClient() {
+ShillManagerClient*
+    MockDBusThreadManagerWithoutGMock::GetShillManagerClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-FlimflamNetworkClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamNetworkClient() {
+ShillNetworkClient*
+    MockDBusThreadManagerWithoutGMock::GetShillNetworkClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-FlimflamProfileClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamProfileClient() {
+ShillProfileClient*
+    MockDBusThreadManagerWithoutGMock::GetShillProfileClient() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-FlimflamServiceClient*
-    MockDBusThreadManagerWithoutGMock::GetFlimflamServiceClient() {
+ShillServiceClient*
+    MockDBusThreadManagerWithoutGMock::GetShillServiceClient() {
   NOTIMPLEMENTED();
   return NULL;
 }