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

chromeos/dbus/dbus_thread_manager.cc

 // 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.
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_manager_client.h"
 #include "chromeos/dbus/bluetooth_node_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "chromeos/dbus/cashew_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/debug_daemon_client.h"
-#include "chromeos/dbus/flimflam_device_client.h"
-#include "chromeos/dbus/flimflam_ipconfig_client.h"
-#include "chromeos/dbus/flimflam_manager_client.h"
-#include "chromeos/dbus/flimflam_network_client.h"
-#include "chromeos/dbus/flimflam_profile_client.h"
-#include "chromeos/dbus/flimflam_service_client.h"
+#include "chromeos/dbus/shill_device_client.h"
+#include "chromeos/dbus/shill_ipconfig_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
+#include "chromeos/dbus/shill_network_client.h"
+#include "chromeos/dbus/shill_profile_client.h"
+#include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/media_transfer_protocol_daemon_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
@@ skipping 50 matching lines @@
     cashew_client_.reset(CashewClient::Create(client_type, system_bus_.get()));
     // Create the cros-disks client.
     cros_disks_client_.reset(
         CrosDisksClient::Create(client_type, system_bus_.get()));
     // Create the Cryptohome client.
     cryptohome_client_.reset(
         CryptohomeClient::Create(client_type, system_bus_.get()));
     // Create the debugdaemon client.
     debugdaemon_client_.reset(
         DebugDaemonClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam Device client.
-    flimflam_device_client_.reset(
-        FlimflamDeviceClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam IPConfig client.
-    flimflam_ipconfig_client_.reset(
-        FlimflamIPConfigClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam Manager client.
-    flimflam_manager_client_.reset(
-        FlimflamManagerClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam Network client.
-    flimflam_network_client_.reset(
-        FlimflamNetworkClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam Profile client.
-    flimflam_profile_client_.reset(
-        FlimflamProfileClient::Create(client_type, system_bus_.get()));
-    // Create the Flimflam Service client.
-    flimflam_service_client_.reset(
-        FlimflamServiceClient::Create(client_type, system_bus_.get()));
+    // Create the Shill Device client.
+    shill_device_client_.reset(
+        ShillDeviceClient::Create(client_type, system_bus_.get()));
+    // Create the Shill IPConfig client.
+    shill_ipconfig_client_.reset(
+        ShillIPConfigClient::Create(client_type, system_bus_.get()));
+    // Create the Shill Manager client.
+    shill_manager_client_.reset(
+        ShillManagerClient::Create(client_type, system_bus_.get()));
+    // Create the Shill Network client.
+    shill_network_client_.reset(
+        ShillNetworkClient::Create(client_type, system_bus_.get()));
+    // Create the Shill Profile client.
+    shill_profile_client_.reset(
+        ShillProfileClient::Create(client_type, system_bus_.get()));
+    // Create the Shill Service client.
+    shill_service_client_.reset(
+        ShillServiceClient::Create(client_type, system_bus_.get()));
     // Create the Gsm SMS client.
     gsm_sms_client_.reset(
         GsmSMSClient::Create(client_type, system_bus_.get()));
     // Create the image burner client.
     image_burner_client_.reset(ImageBurnerClient::Create(client_type,
                                                          system_bus_.get()));
     // Create the introspectable object client.
     introspectable_client_.reset(
         IntrospectableClient::Create(client_type, system_bus_.get()));
     // Create the media transfer protocol daemon client.
@@ skipping 127 matching lines @@
   virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE {
     return cryptohome_client_.get();
   }
 
   // DBusThreadManager override.
   virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE {
     return debugdaemon_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamDeviceClient* GetFlimflamDeviceClient() OVERRIDE {
-    return flimflam_device_client_.get();
+  virtual ShillDeviceClient* GetShillDeviceClient() OVERRIDE {
+    return shill_device_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE {
-    return flimflam_ipconfig_client_.get();
+  virtual ShillIPConfigClient* GetShillIPConfigClient() OVERRIDE {
+    return shill_ipconfig_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamManagerClient* GetFlimflamManagerClient() OVERRIDE {
-    return flimflam_manager_client_.get();
+  virtual ShillManagerClient* GetShillManagerClient() OVERRIDE {
+    return shill_manager_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamNetworkClient* GetFlimflamNetworkClient() OVERRIDE {
-    return flimflam_network_client_.get();
+  virtual ShillNetworkClient* GetShillNetworkClient() OVERRIDE {
+    return shill_network_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamProfileClient* GetFlimflamProfileClient() OVERRIDE {
-    return flimflam_profile_client_.get();
+  virtual ShillProfileClient* GetShillProfileClient() OVERRIDE {
+    return shill_profile_client_.get();
   }
 
   // DBusThreadManager override.
-  virtual FlimflamServiceClient* GetFlimflamServiceClient() OVERRIDE {
-    return flimflam_service_client_.get();
+  virtual ShillServiceClient* GetShillServiceClient() OVERRIDE {
+    return shill_service_client_.get();
   }
 
   // DBusThreadManager override.
   virtual GsmSMSClient* GetGsmSMSClient() OVERRIDE {
     return gsm_sms_client_.get();
   }
 
   // DBusThreadManager override.
   virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE {
     return image_burner_client_.get();
@@ skipping 93 matching lines @@
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
   scoped_ptr<BluetoothNodeClient> bluetooth_node_client_;
   scoped_ptr<BluetoothOutOfBandClient> bluetooth_out_of_band_client_;
   scoped_ptr<CashewClient> cashew_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debugdaemon_client_;
-  scoped_ptr<FlimflamDeviceClient> flimflam_device_client_;
-  scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_;
-  scoped_ptr<FlimflamManagerClient> flimflam_manager_client_;
-  scoped_ptr<FlimflamNetworkClient> flimflam_network_client_;
-  scoped_ptr<FlimflamProfileClient> flimflam_profile_client_;
-  scoped_ptr<FlimflamServiceClient> flimflam_service_client_;
+  scoped_ptr<ShillDeviceClient> shill_device_client_;
+  scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
+  scoped_ptr<ShillManagerClient> shill_manager_client_;
+  scoped_ptr<ShillNetworkClient> shill_network_client_;
+  scoped_ptr<ShillProfileClient> shill_profile_client_;
+  scoped_ptr<ShillServiceClient> shill_service_client_;
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
   scoped_ptr<MediaTransferProtocolDaemonClient>
       media_transfer_protocol_daemon_client_;
   scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   scoped_ptr<PermissionBrokerClient> permission_broker_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
@@ skipping 63 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos