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

chromeos/dbus/flimflam_client_unittest_base.h

Index: chromeos/dbus/flimflam_client_unittest_base.h
diff --git a/chromeos/dbus/flimflam_client_unittest_base.h b/chromeos/dbus/flimflam_client_unittest_base.h
deleted file mode 100644
index 68ac59ca11e97b391d12eb2fabd6182ea902eaed..0000000000000000000000000000000000000000
--- a/chromeos/dbus/flimflam_client_unittest_base.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// 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_
-
-#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 "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 {
- 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();
-  };
-
-  explicit FlimflamClientUnittestBase(const std::string& interface_name,
-                                      const dbus::ObjectPath& object_path);
-  virtual ~FlimflamClientUnittestBase();
-
-  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.
-  void PrepareForMethodCall(const std::string& method_name,
-                            const ArgumentCheckCallback& argument_checker,
-                            dbus::Response* response);
-
-  // Sends property changed signal to the tested client.
-  void SendPropertyChangedSignal(dbus::Signal* signal);
-
-  // Checks the name and the value which are sent by PropertyChanged signal.
-  static void ExpectPropertyChanged(const std::string& expected_name,
-                                    const base::Value* expected_value,
-                                    const std::string& name,
-                                    const base::Value& value);
-
-  // Expects the reader to be empty.
-  static void ExpectNoArgument(dbus::MessageReader* reader);
-
-  // Expects the reader to have a string.
-  static void ExpectStringArgument(const std::string& expected_string,
-                                   dbus::MessageReader* reader);
-
-  // Expects the reader to have a Value.
-  static void ExpectValueArgument(const base::Value* expected_value,
-                                  dbus::MessageReader* reader);
-
-  // Expects the reader to have a string and a Value.
-  static void ExpectStringAndValueArguments(const std::string& expected_string,
-                                            const base::Value* expected_value,
-                                            dbus::MessageReader* reader);
-
-  // Expects the call status to be SUCCESS.
-  static void ExpectNoResultValue(DBusMethodCallStatus call_status);
-
-  // Checks the result and expects the call status to be SUCCESS.
-  static void ExpectObjectPathResult(const dbus::ObjectPath& expected_result,
-                                     DBusMethodCallStatus call_status,
-                                     const dbus::ObjectPath& result);
-
-  // Checks the result and expects the call status to be SUCCESS.
-  static void ExpectDictionaryValueResult(
-      const base::DictionaryValue* expected_result,
-      DBusMethodCallStatus call_status,
-      const base::DictionaryValue& result);
-
-  // A message loop to emulate asynchronous behavior.
-  MessageLoop message_loop_;
-  // The mock bus.
-  scoped_refptr<dbus::MockBus> mock_bus_;
-
- private:
-  // Checks the requested interface name and signal name.
-  // Used to implement the mock proxy.
-  void OnConnectToSignal(
-      const std::string& interface_name,
-      const std::string& signal_name,
-      const dbus::ObjectProxy::SignalCallback& signal_callback,
-      const dbus::ObjectProxy::OnConnectedCallback& on_connected_callback);
-
-  // Checks the content of the method call and returns the response.
-  // Used to implement the mock proxy.
-  void OnCallMethod(
-      dbus::MethodCall* method_call,
-      int timeout_ms,
-      const dbus::ObjectProxy::ResponseCallback& response_callback);
-
-  // Checks the content of the method call and returns the response.
-  // Used to implement the mock proxy.
-  void OnCallMethodWithErrorCallback(
-      dbus::MethodCall* method_call,
-      int timeout_ms,
-      const dbus::ObjectProxy::ResponseCallback& response_callback,
-      const dbus::ObjectProxy::ErrorCallback& error_callback);
-
-  // Checks the content of the method call and returns the response.
-  // Used to implement the mock proxy.
-  dbus::Response* OnCallMethodAndBlock(dbus::MethodCall* method_call,
-                                       int timeout_ms);
-
-  // The interface name.
-  const std::string interface_name_;
-  // The object path.
-  const dbus::ObjectPath object_path_;
-  // The mock object proxy.
-  scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
-  // The PropertyChanged signal handler given by the tested client.
-  dbus::ObjectProxy::SignalCallback property_changed_handler_;
-  // 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_