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

chromeos/dbus/shill_client_unittest_base.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_CLIENT_UNITTEST_BASE_H_
-#define CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
+#ifndef CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
+#define CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
-#include "chromeos/dbus/flimflam_client_helper.h"
+#include "chromeos/dbus/shill_client_helper.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/object_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 class Value;
 class DictionaryValue;
 
 }  // namespace base
 
 namespace dbus {
 
 class MessageReader;
 
 }  // namespace dbus
 
 namespace chromeos {
 
-// A class to provide functionalities needed for testing Flimflam D-Bus clients.
-class FlimflamClientUnittestBase : public testing::Test {
+// A class to provide functionalities needed for testing Shill D-Bus clients.
+class ShillClientUnittestBase : public testing::Test {
  public:
   // A mock Closure.
   class MockClosure {
    public:
     MockClosure();
     ~MockClosure();
     MOCK_METHOD0(Run, void());
     base::Closure GetCallback();
   };
 
   // A mock ErrorCallback.
   class MockErrorCallback {
    public:
     MockErrorCallback();
     ~MockErrorCallback();
     MOCK_METHOD2(Run, void(const std::string& error_name,
                            const std::string& error_mesage));
-    FlimflamClientHelper::ErrorCallback GetCallback();
+    ShillClientHelper::ErrorCallback GetCallback();
   };
 
-  explicit FlimflamClientUnittestBase(const std::string& interface_name,
+  explicit ShillClientUnittestBase(const std::string& interface_name,
                                       const dbus::ObjectPath& object_path);
-  virtual ~FlimflamClientUnittestBase();
+  virtual ~ShillClientUnittestBase();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   // A callback to intercept and check the method call arguments.
   typedef base::Callback<void(
       dbus::MessageReader* reader)> ArgumentCheckCallback;
 
   // Sets expectations for called method name and arguments, and sets response.
@@ skipping 85 matching lines @@
   // The name of the method which is expected to be called.
   std::string expected_method_name_;
   // The response which the mock object proxy returns.
   dbus::Response* response_;
   // A callback to intercept and check the method call arguments.
   ArgumentCheckCallback argument_checker_;
 };
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FLIMFLAM_CLIENT_UNITTEST_BASE_H_
+#endif  // CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_