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

chromeos/dbus/dbus_thread_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 #define CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 class BluetoothAdapterClient;
 class BluetoothDeviceClient;
 class BluetoothInputClient;
 class BluetoothManagerClient;
 class BluetoothNodeClient;
 class BluetoothOutOfBandClient;
 class CashewClient;
 class CrosDisksClient;
 class CryptohomeClient;
 class DebugDaemonClient;
-class FlimflamDeviceClient;
-class FlimflamIPConfigClient;
-class FlimflamManagerClient;
-class FlimflamNetworkClient;
-class FlimflamProfileClient;
-class FlimflamServiceClient;
+class ShillDeviceClient;
+class ShillIPConfigClient;
+class ShillManagerClient;
+class ShillNetworkClient;
+class ShillProfileClient;
+class ShillServiceClient;
 class GsmSMSClient;
 class IBusClient;
 class IBusEngineFactoryService;
 class IBusEngineService;
 class IBusInputContextClient;
 class ImageBurnerClient;
 class IntrospectableClient;
 class MediaTransferProtocolDaemonClient;
 class ModemMessagingClient;
 class PermissionBrokerClient;
@@ skipping 97 matching lines @@
   // Returns the Cryptohome client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
   virtual CryptohomeClient* GetCryptohomeClient() = 0;
 
   // Returns the DebugDaemon client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
   virtual DebugDaemonClient* GetDebugDaemonClient() = 0;
 
-  // Returns the Flimflam Device client, owned by DBusThreadManager.
+  // Returns the Shill Device client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamDeviceClient* GetFlimflamDeviceClient() = 0;
+  virtual ShillDeviceClient* GetShillDeviceClient() = 0;
 
-  // Returns the Flimflam IPConfig client, owned by DBusThreadManager.
+  // Returns the Shill IPConfig client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() = 0;
+  virtual ShillIPConfigClient* GetShillIPConfigClient() = 0;
 
-  // Returns the Flimflam Manager client, owned by DBusThreadManager.
+  // Returns the Shill Manager client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamManagerClient* GetFlimflamManagerClient() = 0;
+  virtual ShillManagerClient* GetShillManagerClient() = 0;
 
-  // Returns the Flimflam Network client, owned by DBusThreadManager.
+  // Returns the Shill Network client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamNetworkClient* GetFlimflamNetworkClient() = 0;
+  virtual ShillNetworkClient* GetShillNetworkClient() = 0;
 
-  // Returns the Flimflam Profile client, owned by DBusThreadManager.
+  // Returns the Shill Profile client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamProfileClient* GetFlimflamProfileClient() = 0;
+  virtual ShillProfileClient* GetShillProfileClient() = 0;
 
-  // Returns the Flimflam Service client, owned by DBusThreadManager.
+  // Returns the Shill Service client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
-  virtual FlimflamServiceClient* GetFlimflamServiceClient() = 0;
+  virtual ShillServiceClient* GetShillServiceClient() = 0;
 
   // Returns the SMS client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManager is shut
   // down.
   virtual GsmSMSClient* GetGsmSMSClient() = 0;
 
   // Returns the image burner client, owned by DBusThreadManager.
   // Do not cache this pointer and use it after DBusThreadManger is shut
   // down.
   virtual ImageBurnerClient* GetImageBurnerClient() = 0;
@@ skipping 65 matching lines @@
 
  protected:
   DBusThreadManager();
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_