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

Side by Side Diff: chromeos/dbus/mock_dbus_thread_manager.cc

Issue 11887008: Deprecate ShillNetworkClient and add GeolocationHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittest Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/mock_dbus_thread_manager.h" 5 #include "chromeos/dbus/mock_dbus_thread_manager.h"
6 6
7 #include "chromeos/dbus/dbus_thread_manager_observer.h" 7 #include "chromeos/dbus/dbus_thread_manager_observer.h"
8 #include "chromeos/dbus/mock_bluetooth_adapter_client.h" 8 #include "chromeos/dbus/mock_bluetooth_adapter_client.h"
9 #include "chromeos/dbus/mock_bluetooth_device_client.h" 9 #include "chromeos/dbus/mock_bluetooth_device_client.h"
10 #include "chromeos/dbus/mock_bluetooth_input_client.h" 10 #include "chromeos/dbus/mock_bluetooth_input_client.h"
11 #include "chromeos/dbus/mock_bluetooth_manager_client.h" 11 #include "chromeos/dbus/mock_bluetooth_manager_client.h"
12 #include "chromeos/dbus/mock_bluetooth_node_client.h" 12 #include "chromeos/dbus/mock_bluetooth_node_client.h"
13 #include "chromeos/dbus/mock_bluetooth_out_of_band_client.h" 13 #include "chromeos/dbus/mock_bluetooth_out_of_band_client.h"
14 #include "chromeos/dbus/mock_cros_disks_client.h" 14 #include "chromeos/dbus/mock_cros_disks_client.h"
15 #include "chromeos/dbus/mock_cryptohome_client.h" 15 #include "chromeos/dbus/mock_cryptohome_client.h"
16 #include "chromeos/dbus/mock_debug_daemon_client.h" 16 #include "chromeos/dbus/mock_debug_daemon_client.h"
17 #include "chromeos/dbus/mock_shill_device_client.h" 17 #include "chromeos/dbus/mock_shill_device_client.h"
18 #include "chromeos/dbus/mock_shill_ipconfig_client.h" 18 #include "chromeos/dbus/mock_shill_ipconfig_client.h"
19 #include "chromeos/dbus/mock_shill_manager_client.h" 19 #include "chromeos/dbus/mock_shill_manager_client.h"
20 #include "chromeos/dbus/mock_shill_network_client.h"
21 #include "chromeos/dbus/mock_shill_profile_client.h" 20 #include "chromeos/dbus/mock_shill_profile_client.h"
22 #include "chromeos/dbus/mock_shill_service_client.h" 21 #include "chromeos/dbus/mock_shill_service_client.h"
23 #include "chromeos/dbus/mock_gsm_sms_client.h" 22 #include "chromeos/dbus/mock_gsm_sms_client.h"
24 #include "chromeos/dbus/mock_image_burner_client.h" 23 #include "chromeos/dbus/mock_image_burner_client.h"
25 #include "chromeos/dbus/mock_introspectable_client.h" 24 #include "chromeos/dbus/mock_introspectable_client.h"
26 #include "chromeos/dbus/mock_modem_messaging_client.h" 25 #include "chromeos/dbus/mock_modem_messaging_client.h"
27 #include "chromeos/dbus/mock_permission_broker_client.h" 26 #include "chromeos/dbus/mock_permission_broker_client.h"
28 #include "chromeos/dbus/mock_power_manager_client.h" 27 #include "chromeos/dbus/mock_power_manager_client.h"
29 #include "chromeos/dbus/mock_root_power_manager_client.h" 28 #include "chromeos/dbus/mock_root_power_manager_client.h"
30 #include "chromeos/dbus/mock_session_manager_client.h" 29 #include "chromeos/dbus/mock_session_manager_client.h"
(...skipping 14 matching lines...) Expand all
45 mock_bluetooth_input_client_(new MockBluetoothInputClient), 44 mock_bluetooth_input_client_(new MockBluetoothInputClient),
46 mock_bluetooth_manager_client_(new MockBluetoothManagerClient), 45 mock_bluetooth_manager_client_(new MockBluetoothManagerClient),
47 mock_bluetooth_node_client_(new MockBluetoothNodeClient), 46 mock_bluetooth_node_client_(new MockBluetoothNodeClient),
48 mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient), 47 mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient),
49 mock_cros_disks_client_(new MockCrosDisksClient), 48 mock_cros_disks_client_(new MockCrosDisksClient),
50 mock_cryptohome_client_(new MockCryptohomeClient), 49 mock_cryptohome_client_(new MockCryptohomeClient),
51 mock_debugdaemon_client_(new MockDebugDaemonClient), 50 mock_debugdaemon_client_(new MockDebugDaemonClient),
52 mock_shill_device_client_(new MockShillDeviceClient), 51 mock_shill_device_client_(new MockShillDeviceClient),
53 mock_shill_ipconfig_client_(new MockShillIPConfigClient), 52 mock_shill_ipconfig_client_(new MockShillIPConfigClient),
54 mock_shill_manager_client_(new MockShillManagerClient), 53 mock_shill_manager_client_(new MockShillManagerClient),
55 mock_shill_network_client_(new MockShillNetworkClient),
56 mock_shill_profile_client_(new MockShillProfileClient), 54 mock_shill_profile_client_(new MockShillProfileClient),
57 mock_shill_service_client_(new MockShillServiceClient), 55 mock_shill_service_client_(new MockShillServiceClient),
58 mock_gsm_sms_client_(new MockGsmSMSClient), 56 mock_gsm_sms_client_(new MockGsmSMSClient),
59 mock_image_burner_client_(new MockImageBurnerClient), 57 mock_image_burner_client_(new MockImageBurnerClient),
60 mock_introspectable_client_(new MockIntrospectableClient), 58 mock_introspectable_client_(new MockIntrospectableClient),
61 mock_modem_messaging_client_(new MockModemMessagingClient), 59 mock_modem_messaging_client_(new MockModemMessagingClient),
62 mock_permission_broker_client_(new MockPermissionBrokerClient), 60 mock_permission_broker_client_(new MockPermissionBrokerClient),
63 mock_power_manager_client_(new MockPowerManagerClient), 61 mock_power_manager_client_(new MockPowerManagerClient),
64 mock_root_power_manager_client_(new MockRootPowerManagerClient), 62 mock_root_power_manager_client_(new MockRootPowerManagerClient),
65 mock_session_manager_client_(new MockSessionManagerClient), 63 mock_session_manager_client_(new MockSessionManagerClient),
(...skipping 17 matching lines...) Expand all
83 EXPECT_CALL(*this, GetCryptohomeClient()) 81 EXPECT_CALL(*this, GetCryptohomeClient())
84 .WillRepeatedly(Return(mock_cryptohome_client())); 82 .WillRepeatedly(Return(mock_cryptohome_client()));
85 EXPECT_CALL(*this, GetDebugDaemonClient()) 83 EXPECT_CALL(*this, GetDebugDaemonClient())
86 .WillRepeatedly(Return(mock_debugdaemon_client())); 84 .WillRepeatedly(Return(mock_debugdaemon_client()));
87 EXPECT_CALL(*this, GetShillDeviceClient()) 85 EXPECT_CALL(*this, GetShillDeviceClient())
88 .WillRepeatedly(Return(mock_shill_device_client())); 86 .WillRepeatedly(Return(mock_shill_device_client()));
89 EXPECT_CALL(*this, GetShillIPConfigClient()) 87 EXPECT_CALL(*this, GetShillIPConfigClient())
90 .WillRepeatedly(Return(mock_shill_ipconfig_client())); 88 .WillRepeatedly(Return(mock_shill_ipconfig_client()));
91 EXPECT_CALL(*this, GetShillManagerClient()) 89 EXPECT_CALL(*this, GetShillManagerClient())
92 .WillRepeatedly(Return(mock_shill_manager_client())); 90 .WillRepeatedly(Return(mock_shill_manager_client()));
93 EXPECT_CALL(*this, GetShillNetworkClient())
94 .WillRepeatedly(Return(mock_shill_network_client()));
95 EXPECT_CALL(*this, GetShillProfileClient()) 91 EXPECT_CALL(*this, GetShillProfileClient())
96 .WillRepeatedly(Return(mock_shill_profile_client())); 92 .WillRepeatedly(Return(mock_shill_profile_client()));
97 EXPECT_CALL(*this, GetShillServiceClient()) 93 EXPECT_CALL(*this, GetShillServiceClient())
98 .WillRepeatedly(Return(mock_shill_service_client())); 94 .WillRepeatedly(Return(mock_shill_service_client()));
99 EXPECT_CALL(*this, GetGsmSMSClient()) 95 EXPECT_CALL(*this, GetGsmSMSClient())
100 .WillRepeatedly(Return(mock_gsm_sms_client())); 96 .WillRepeatedly(Return(mock_gsm_sms_client()));
101 EXPECT_CALL(*this, GetImageBurnerClient()) 97 EXPECT_CALL(*this, GetImageBurnerClient())
102 .WillRepeatedly(Return(mock_image_burner_client())); 98 .WillRepeatedly(Return(mock_image_burner_client()));
103 EXPECT_CALL(*this, GetIntrospectableClient()) 99 EXPECT_CALL(*this, GetIntrospectableClient())
104 .WillRepeatedly(Return(mock_introspectable_client())); 100 .WillRepeatedly(Return(mock_introspectable_client()));
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 observers_.AddObserver(observer); 188 observers_.AddObserver(observer);
193 } 189 }
194 190
195 void MockDBusThreadManager::RemoveObserver( 191 void MockDBusThreadManager::RemoveObserver(
196 DBusThreadManagerObserver* observer) { 192 DBusThreadManagerObserver* observer) {
197 DCHECK(observer); 193 DCHECK(observer);
198 observers_.RemoveObserver(observer); 194 observers_.RemoveObserver(observer);
199 } 195 }
200 196
201 } // namespace chromeos 197 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698