From 11a5fada89d3d3fc9b64d8122df5a41d8aac4bdf Mon Sep 17 00:00:00 2001 From: "satorux@chromium.org" Date: Sat, 19 Oct 2013 18:48:54 +0000 Subject: dbus: Remove mock_gsm_sms_client.h/cc These files are no longer in use. BUG=234498 TEST=none Review URL: https://codereview.chromium.org/27652003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229617 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/dbus/mock_dbus_thread_manager.cc | 16 +++++------ chromeos/dbus/mock_dbus_thread_manager.h | 10 +++---- chromeos/dbus/mock_gsm_sms_client.cc | 13 --------- chromeos/dbus/mock_gsm_sms_client.h | 46 ------------------------------- 4 files changed, 13 insertions(+), 72 deletions(-) delete mode 100644 chromeos/dbus/mock_gsm_sms_client.cc delete mode 100644 chromeos/dbus/mock_gsm_sms_client.h (limited to 'chromeos/dbus') diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc index d661663..11b97f6 100644 --- a/chromeos/dbus/mock_dbus_thread_manager.cc +++ b/chromeos/dbus/mock_dbus_thread_manager.cc @@ -10,6 +10,7 @@ #include "chromeos/dbus/fake_bluetooth_device_client.h" #include "chromeos/dbus/fake_bluetooth_input_client.h" #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h" +#include "chromeos/dbus/fake_gsm_sms_client.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h" #include "chromeos/dbus/ibus/mock_ibus_engine_service.h" @@ -19,7 +20,6 @@ #include "chromeos/dbus/mock_shill_manager_client.h" #include "chromeos/dbus/mock_shill_profile_client.h" #include "chromeos/dbus/mock_shill_service_client.h" -#include "chromeos/dbus/mock_gsm_sms_client.h" #include "chromeos/dbus/mock_session_manager_client.h" #include "chromeos/dbus/power_policy_controller.h" @@ -47,20 +47,20 @@ std::vector* GetMockSystemSalt() { } // namespace MockDBusThreadManager::MockDBusThreadManager() - : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()), + : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient), fake_bluetooth_agent_manager_client_( - new FakeBluetoothAgentManagerClient()), - fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()), - fake_bluetooth_input_client_(new FakeBluetoothInputClient()), + new FakeBluetoothAgentManagerClient), + fake_bluetooth_device_client_(new FakeBluetoothDeviceClient), + fake_bluetooth_input_client_(new FakeBluetoothInputClient), fake_bluetooth_profile_manager_client_( - new FakeBluetoothProfileManagerClient()), + new FakeBluetoothProfileManagerClient), + fake_gsm_sms_client_(new FakeGsmSMSClient), mock_cryptohome_client_(new MockCryptohomeClient), mock_shill_device_client_(new MockShillDeviceClient), mock_shill_ipconfig_client_(new MockShillIPConfigClient), mock_shill_manager_client_(new MockShillManagerClient), mock_shill_profile_client_(new MockShillProfileClient), mock_shill_service_client_(new MockShillServiceClient), - mock_gsm_sms_client_(new MockGsmSMSClient), mock_session_manager_client_(new MockSessionManagerClient) { EXPECT_CALL(*this, GetCryptohomeClient()) .WillRepeatedly(Return(mock_cryptohome_client())); @@ -85,7 +85,7 @@ MockDBusThreadManager::MockDBusThreadManager() EXPECT_CALL(*this, GetShillServiceClient()) .WillRepeatedly(Return(mock_shill_service_client())); EXPECT_CALL(*this, GetGsmSMSClient()) - .WillRepeatedly(Return(mock_gsm_sms_client())); + .WillRepeatedly(Return(fake_gsm_sms_client())); EXPECT_CALL(*this, GetSessionManagerClient()) .WillRepeatedly(Return(mock_session_manager_client_.get())); diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h index 7072081..23bca2e 100644 --- a/chromeos/dbus/mock_dbus_thread_manager.h +++ b/chromeos/dbus/mock_dbus_thread_manager.h @@ -25,13 +25,13 @@ class FakeBluetoothAgentManagerClient; class FakeBluetoothDeviceClient; class FakeBluetoothInputClient; class FakeBluetoothProfileManagerClient; +class FakeGsmSMSClient; class MockCryptohomeClient; class MockShillDeviceClient; class MockShillIPConfigClient; class MockShillManagerClient; class MockShillProfileClient; class MockShillServiceClient; -class MockGsmSMSClient; class MockPowerManagerClient; class MockSessionManagerClient; @@ -100,6 +100,9 @@ class MockDBusThreadManager : public DBusThreadManager { FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client() { return fake_bluetooth_profile_manager_client_.get(); } + FakeGsmSMSClient* fake_gsm_sms_client() { + return fake_gsm_sms_client_.get(); + } MockCryptohomeClient* mock_cryptohome_client() { return mock_cryptohome_client_.get(); } @@ -118,9 +121,6 @@ class MockDBusThreadManager : public DBusThreadManager { MockShillServiceClient* mock_shill_service_client() { return mock_shill_service_client_.get(); } - MockGsmSMSClient* mock_gsm_sms_client() { - return mock_gsm_sms_client_.get(); - } MockSessionManagerClient* mock_session_manager_client() { return mock_session_manager_client_.get(); } @@ -137,13 +137,13 @@ class MockDBusThreadManager : public DBusThreadManager { scoped_ptr fake_bluetooth_input_client_; scoped_ptr fake_bluetooth_profile_manager_client_; + scoped_ptr fake_gsm_sms_client_; scoped_ptr mock_cryptohome_client_; scoped_ptr mock_shill_device_client_; scoped_ptr mock_shill_ipconfig_client_; scoped_ptr mock_shill_manager_client_; scoped_ptr mock_shill_profile_client_; scoped_ptr mock_shill_service_client_; - scoped_ptr mock_gsm_sms_client_; scoped_ptr mock_session_manager_client_; DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManager); diff --git a/chromeos/dbus/mock_gsm_sms_client.cc b/chromeos/dbus/mock_gsm_sms_client.cc deleted file mode 100644 index 0f958e6..0000000 --- a/chromeos/dbus/mock_gsm_sms_client.cc +++ /dev/null @@ -1,13 +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. - -#include "chromeos/dbus/mock_gsm_sms_client.h" - -namespace chromeos { - -MockGsmSMSClient::MockGsmSMSClient() {} - -MockGsmSMSClient::~MockGsmSMSClient() {} - -} // namespace chromeos diff --git a/chromeos/dbus/mock_gsm_sms_client.h b/chromeos/dbus/mock_gsm_sms_client.h deleted file mode 100644 index aa522c5..0000000 --- a/chromeos/dbus/mock_gsm_sms_client.h +++ /dev/null @@ -1,46 +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_MOCK_GSM_SMS_CLIENT_H_ -#define CHROMEOS_DBUS_MOCK_GSM_SMS_CLIENT_H_ - -#include - -#include "base/values.h" -#include "chromeos/dbus/gsm_sms_client.h" -#include "dbus/object_path.h" -#include "testing/gmock/include/gmock/gmock.h" - -namespace chromeos { - -class MockGsmSMSClient : public GsmSMSClient { - public: - MockGsmSMSClient(); - virtual ~MockGsmSMSClient(); - - MOCK_METHOD1(Init, void(dbus::Bus* bus)); - MOCK_METHOD3(SetSmsReceivedHandler, void(const std::string& service_name, - const dbus::ObjectPath& object_path, - const SmsReceivedHandler& handler)); - MOCK_METHOD2(ResetSmsReceivedHandler, - void(const std::string& service_name, - const dbus::ObjectPath& object_path)); - MOCK_METHOD4(Delete, void(const std::string& service_name, - const dbus::ObjectPath& object_path, - uint32 index, - const DeleteCallback& callback)); - MOCK_METHOD4(Get, void(const std::string& service_name, - const dbus::ObjectPath& object_path, - uint32 index, - const GetCallback& callback)); - MOCK_METHOD3(List, void(const std::string& service_name, - const dbus::ObjectPath& object_path, - const ListCallback& callback)); - MOCK_METHOD2(RequestUpdate, void(const std::string& service_name, - const dbus::ObjectPath& object_path)); -}; - -} // namespace chromeos - -#endif // CHROMEOS_DBUS_MOCK_GSM_SMS_CLIENT_H_ -- cgit v1.1