Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 15020009: Bluetooth: remove legacy backend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/mock_dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager_without_gmock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/mock_dbus_thread_manager.cc
diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc
index cdf7d0cec20db1c951a2095621b7fbb27b732ff1..518e745eea01bca2f83172c1c137b9b87751ac83 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager.cc
@@ -16,12 +16,6 @@
#include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
#include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
#include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
-#include "chromeos/dbus/mock_bluetooth_adapter_client.h"
-#include "chromeos/dbus/mock_bluetooth_device_client.h"
-#include "chromeos/dbus/mock_bluetooth_input_client.h"
-#include "chromeos/dbus/mock_bluetooth_manager_client.h"
-#include "chromeos/dbus/mock_bluetooth_node_client.h"
-#include "chromeos/dbus/mock_bluetooth_out_of_band_client.h"
#include "chromeos/dbus/mock_cryptohome_client.h"
#include "chromeos/dbus/mock_shill_device_client.h"
#include "chromeos/dbus/mock_shill_ipconfig_client.h"
@@ -63,12 +57,6 @@ MockDBusThreadManager::MockDBusThreadManager()
fake_bluetooth_input_client_(new FakeBluetoothInputClient()),
fake_bluetooth_profile_manager_client_(
new FakeBluetoothProfileManagerClient()),
- mock_bluetooth_adapter_client_(new MockBluetoothAdapterClient),
- mock_bluetooth_device_client_(new MockBluetoothDeviceClient),
- mock_bluetooth_input_client_(new MockBluetoothInputClient),
- mock_bluetooth_manager_client_(new MockBluetoothManagerClient),
- mock_bluetooth_node_client_(new MockBluetoothNodeClient),
- mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient),
mock_cryptohome_client_(new MockCryptohomeClient),
mock_shill_device_client_(new MockShillDeviceClient),
mock_shill_ipconfig_client_(new MockShillIPConfigClient),
@@ -77,18 +65,6 @@ MockDBusThreadManager::MockDBusThreadManager()
mock_shill_service_client_(new MockShillServiceClient),
mock_gsm_sms_client_(new MockGsmSMSClient),
mock_session_manager_client_(new MockSessionManagerClient) {
- EXPECT_CALL(*this, GetBluetoothAdapterClient())
- .WillRepeatedly(Return(mock_bluetooth_adapter_client_.get()));
- EXPECT_CALL(*this, GetBluetoothDeviceClient())
- .WillRepeatedly(Return(mock_bluetooth_device_client_.get()));
- EXPECT_CALL(*this, GetBluetoothInputClient())
- .WillRepeatedly(Return(mock_bluetooth_input_client_.get()));
- EXPECT_CALL(*this, GetBluetoothManagerClient())
- .WillRepeatedly(Return(mock_bluetooth_manager_client()));
- EXPECT_CALL(*this, GetBluetoothNodeClient())
- .WillRepeatedly(Return(mock_bluetooth_node_client_.get()));
- EXPECT_CALL(*this, GetBluetoothOutOfBandClient())
- .WillRepeatedly(Return(mock_bluetooth_out_of_band_client_.get()));
EXPECT_CALL(*this, GetCryptohomeClient())
.WillRepeatedly(Return(mock_cryptohome_client()));
EXPECT_CALL(*this, GetExperimentalBluetoothAdapterClient())
@@ -128,30 +104,6 @@ MockDBusThreadManager::MockDBusThreadManager()
.Times(AnyNumber());
EXPECT_CALL(*mock_session_manager_client_.get(), HasObserver(_))
.Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_manager_client_.get(), AddObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_manager_client_.get(), RemoveObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_adapter_client_.get(), AddObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_adapter_client_.get(), RemoveObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_device_client_.get(), AddObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_device_client_.get(), RemoveObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_input_client_.get(), AddObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_input_client_.get(), RemoveObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_node_client_.get(), AddObserver(_))
- .Times(AnyNumber());
- EXPECT_CALL(*mock_bluetooth_node_client_.get(), RemoveObserver(_))
- .Times(AnyNumber());
-
- // Called from BluetoothManagerImpl ctor.
- EXPECT_CALL(*mock_bluetooth_manager_client_.get(), DefaultAdapter(_))
- .Times(AnyNumber());
// Called from AsyncMethodCaller ctor and dtor.
EXPECT_CALL(*mock_cryptohome_client_.get(), SetAsyncCallStatusHandlers(_, _))
« no previous file with comments | « chromeos/dbus/mock_dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager_without_gmock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698