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

chromeos/dbus/shill_service_client.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_FLIMFLAM_SERVICE_CLIENT_H_
-#define CHROMEOS_DBUS_FLIMFLAM_SERVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
+#define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
-#include "chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/dbus/shill_client_helper.h"
 
 namespace base {
 
 class Value;
 class DictionaryValue;
 
 }  // namespace base
 
 namespace dbus {
 
 class Bus;
 class ObjectPath;
 
 }  // namespace dbus
 
 namespace chromeos {
 
-// FlimflamServiceClient is used to communicate with the Flimflam Service
+// ShillServiceClient is used to communicate with the Shill Service
 // service.
 // All methods should be called from the origin thread which initializes the
 // DBusThreadManager instance.
-class CHROMEOS_EXPORT FlimflamServiceClient {
+class CHROMEOS_EXPORT ShillServiceClient {
  public:
-  typedef FlimflamClientHelper::PropertyChangedHandler PropertyChangedHandler;
-  typedef FlimflamClientHelper::DictionaryValueCallback DictionaryValueCallback;
-  typedef FlimflamClientHelper::ErrorCallback ErrorCallback;
+  typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
+  typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
+  typedef ShillClientHelper::ErrorCallback ErrorCallback;
 
-  virtual ~FlimflamServiceClient();
+  virtual ~ShillServiceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
-  static FlimflamServiceClient* Create(DBusClientImplementationType type,
+  static ShillServiceClient* Create(DBusClientImplementationType type,
                                        dbus::Bus* bus);
 
   // Sets PropertyChanged signal handler.
   virtual void SetPropertyChangedHandler(
       const dbus::ObjectPath& service_path,
       const PropertyChangedHandler& handler) = 0;
 
   // Resets PropertyChanged signal handler.
   virtual void ResetPropertyChangedHandler(
       const dbus::ObjectPath& service_path) = 0;
@@ skipping 43 matching lines @@
   // the method call finishes.
   //
   // TODO(hashimoto): Refactor CrosActivateCellularModem and remove this method.
   // crosbug.com/29902
   virtual bool CallActivateCellularModemAndBlock(
       const dbus::ObjectPath& service_path,
       const std::string& carrier) = 0;
 
  protected:
   // Create() should be used instead.
-  FlimflamServiceClient();
+  ShillServiceClient();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FlimflamServiceClient);
+  DISALLOW_COPY_AND_ASSIGN(ShillServiceClient);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FLIMFLAM_SERVICE_CLIENT_H_
+#endif  // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_