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

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

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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
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/mock_bluetooth_adapter_client.h" 7 #include "chromeos/dbus/mock_bluetooth_adapter_client.h"
8 #include "chromeos/dbus/mock_bluetooth_device_client.h" 8 #include "chromeos/dbus/mock_bluetooth_device_client.h"
9 #include "chromeos/dbus/mock_bluetooth_input_client.h" 9 #include "chromeos/dbus/mock_bluetooth_input_client.h"
10 #include "chromeos/dbus/mock_bluetooth_manager_client.h" 10 #include "chromeos/dbus/mock_bluetooth_manager_client.h"
11 #include "chromeos/dbus/mock_bluetooth_node_client.h" 11 #include "chromeos/dbus/mock_bluetooth_node_client.h"
12 #include "chromeos/dbus/mock_bluetooth_out_of_band_client.h" 12 #include "chromeos/dbus/mock_bluetooth_out_of_band_client.h"
13 #include "chromeos/dbus/mock_cashew_client.h" 13 #include "chromeos/dbus/mock_cashew_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_flimflam_device_client.h" 17 #include "chromeos/dbus/mock_shill_device_client.h"
18 #include "chromeos/dbus/mock_flimflam_ipconfig_client.h" 18 #include "chromeos/dbus/mock_shill_ipconfig_client.h"
19 #include "chromeos/dbus/mock_flimflam_manager_client.h" 19 #include "chromeos/dbus/mock_shill_manager_client.h"
20 #include "chromeos/dbus/mock_flimflam_network_client.h" 20 #include "chromeos/dbus/mock_shill_network_client.h"
21 #include "chromeos/dbus/mock_flimflam_profile_client.h" 21 #include "chromeos/dbus/mock_shill_profile_client.h"
22 #include "chromeos/dbus/mock_flimflam_service_client.h" 22 #include "chromeos/dbus/mock_shill_service_client.h"
23 #include "chromeos/dbus/mock_gsm_sms_client.h" 23 #include "chromeos/dbus/mock_gsm_sms_client.h"
24 #include "chromeos/dbus/mock_image_burner_client.h" 24 #include "chromeos/dbus/mock_image_burner_client.h"
25 #include "chromeos/dbus/mock_introspectable_client.h" 25 #include "chromeos/dbus/mock_introspectable_client.h"
26 #include "chromeos/dbus/mock_media_transfer_protocol_daemon_client.h" 26 #include "chromeos/dbus/mock_media_transfer_protocol_daemon_client.h"
27 #include "chromeos/dbus/mock_modem_messaging_client.h" 27 #include "chromeos/dbus/mock_modem_messaging_client.h"
28 #include "chromeos/dbus/mock_permission_broker_client.h" 28 #include "chromeos/dbus/mock_permission_broker_client.h"
29 #include "chromeos/dbus/mock_power_manager_client.h" 29 #include "chromeos/dbus/mock_power_manager_client.h"
30 #include "chromeos/dbus/mock_session_manager_client.h" 30 #include "chromeos/dbus/mock_session_manager_client.h"
31 #include "chromeos/dbus/mock_sms_client.h" 31 #include "chromeos/dbus/mock_sms_client.h"
32 #include "chromeos/dbus/mock_speech_synthesizer_client.h" 32 #include "chromeos/dbus/mock_speech_synthesizer_client.h"
(...skipping 10 matching lines...) Expand all
43 : mock_bluetooth_adapter_client_(new MockBluetoothAdapterClient), 43 : mock_bluetooth_adapter_client_(new MockBluetoothAdapterClient),
44 mock_bluetooth_device_client_(new MockBluetoothDeviceClient), 44 mock_bluetooth_device_client_(new MockBluetoothDeviceClient),
45 mock_bluetooth_input_client_(new MockBluetoothInputClient), 45 mock_bluetooth_input_client_(new MockBluetoothInputClient),
46 mock_bluetooth_manager_client_(new MockBluetoothManagerClient), 46 mock_bluetooth_manager_client_(new MockBluetoothManagerClient),
47 mock_bluetooth_node_client_(new MockBluetoothNodeClient), 47 mock_bluetooth_node_client_(new MockBluetoothNodeClient),
48 mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient), 48 mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient),
49 mock_cashew_client_(new MockCashewClient), 49 mock_cashew_client_(new MockCashewClient),
50 mock_cros_disks_client_(new MockCrosDisksClient), 50 mock_cros_disks_client_(new MockCrosDisksClient),
51 mock_cryptohome_client_(new MockCryptohomeClient), 51 mock_cryptohome_client_(new MockCryptohomeClient),
52 mock_debugdaemon_client_(new MockDebugDaemonClient), 52 mock_debugdaemon_client_(new MockDebugDaemonClient),
53 mock_flimflam_device_client_(new MockFlimflamDeviceClient), 53 mock_shill_device_client_(new MockShillDeviceClient),
54 mock_flimflam_ipconfig_client_(new MockFlimflamIPConfigClient), 54 mock_shill_ipconfig_client_(new MockShillIPConfigClient),
55 mock_flimflam_manager_client_(new MockFlimflamManagerClient), 55 mock_shill_manager_client_(new MockShillManagerClient),
56 mock_flimflam_network_client_(new MockFlimflamNetworkClient), 56 mock_shill_network_client_(new MockShillNetworkClient),
57 mock_flimflam_profile_client_(new MockFlimflamProfileClient), 57 mock_shill_profile_client_(new MockShillProfileClient),
58 mock_flimflam_service_client_(new MockFlimflamServiceClient), 58 mock_shill_service_client_(new MockShillServiceClient),
59 mock_gsm_sms_client_(new MockGsmSMSClient), 59 mock_gsm_sms_client_(new MockGsmSMSClient),
60 mock_image_burner_client_(new MockImageBurnerClient), 60 mock_image_burner_client_(new MockImageBurnerClient),
61 mock_introspectable_client_(new MockIntrospectableClient), 61 mock_introspectable_client_(new MockIntrospectableClient),
62 mock_media_transfer_protocol_daemon_client_( 62 mock_media_transfer_protocol_daemon_client_(
63 new MockMediaTransferProtocolDaemonClient), 63 new MockMediaTransferProtocolDaemonClient),
64 mock_modem_messaging_client_(new MockModemMessagingClient), 64 mock_modem_messaging_client_(new MockModemMessagingClient),
65 mock_permission_broker_client_(new MockPermissionBrokerClient), 65 mock_permission_broker_client_(new MockPermissionBrokerClient),
66 mock_power_manager_client_(new MockPowerManagerClient), 66 mock_power_manager_client_(new MockPowerManagerClient),
67 mock_session_manager_client_(new MockSessionManagerClient), 67 mock_session_manager_client_(new MockSessionManagerClient),
68 mock_sms_client_(new MockSMSClient), 68 mock_sms_client_(new MockSMSClient),
(...skipping 12 matching lines...) Expand all
81 EXPECT_CALL(*this, GetBluetoothOutOfBandClient()) 81 EXPECT_CALL(*this, GetBluetoothOutOfBandClient())
82 .WillRepeatedly(Return(mock_bluetooth_out_of_band_client_.get())); 82 .WillRepeatedly(Return(mock_bluetooth_out_of_band_client_.get()));
83 EXPECT_CALL(*this, GetCashewClient()) 83 EXPECT_CALL(*this, GetCashewClient())
84 .WillRepeatedly(Return(mock_cashew_client())); 84 .WillRepeatedly(Return(mock_cashew_client()));
85 EXPECT_CALL(*this, GetCrosDisksClient()) 85 EXPECT_CALL(*this, GetCrosDisksClient())
86 .WillRepeatedly(Return(mock_cros_disks_client())); 86 .WillRepeatedly(Return(mock_cros_disks_client()));
87 EXPECT_CALL(*this, GetCryptohomeClient()) 87 EXPECT_CALL(*this, GetCryptohomeClient())
88 .WillRepeatedly(Return(mock_cryptohome_client())); 88 .WillRepeatedly(Return(mock_cryptohome_client()));
89 EXPECT_CALL(*this, GetDebugDaemonClient()) 89 EXPECT_CALL(*this, GetDebugDaemonClient())
90 .WillRepeatedly(Return(mock_debugdaemon_client())); 90 .WillRepeatedly(Return(mock_debugdaemon_client()));
91 EXPECT_CALL(*this, GetFlimflamDeviceClient()) 91 EXPECT_CALL(*this, GetShillDeviceClient())
92 .WillRepeatedly(Return(mock_flimflam_device_client())); 92 .WillRepeatedly(Return(mock_shill_device_client()));
93 EXPECT_CALL(*this, GetFlimflamIPConfigClient()) 93 EXPECT_CALL(*this, GetShillIPConfigClient())
94 .WillRepeatedly(Return(mock_flimflam_ipconfig_client())); 94 .WillRepeatedly(Return(mock_shill_ipconfig_client()));
95 EXPECT_CALL(*this, GetFlimflamManagerClient()) 95 EXPECT_CALL(*this, GetShillManagerClient())
96 .WillRepeatedly(Return(mock_flimflam_manager_client())); 96 .WillRepeatedly(Return(mock_shill_manager_client()));
97 EXPECT_CALL(*this, GetFlimflamNetworkClient()) 97 EXPECT_CALL(*this, GetShillNetworkClient())
98 .WillRepeatedly(Return(mock_flimflam_network_client())); 98 .WillRepeatedly(Return(mock_shill_network_client()));
99 EXPECT_CALL(*this, GetFlimflamProfileClient()) 99 EXPECT_CALL(*this, GetShillProfileClient())
100 .WillRepeatedly(Return(mock_flimflam_profile_client())); 100 .WillRepeatedly(Return(mock_shill_profile_client()));
101 EXPECT_CALL(*this, GetFlimflamServiceClient()) 101 EXPECT_CALL(*this, GetShillServiceClient())
102 .WillRepeatedly(Return(mock_flimflam_service_client())); 102 .WillRepeatedly(Return(mock_shill_service_client()));
103 EXPECT_CALL(*this, GetGsmSMSClient()) 103 EXPECT_CALL(*this, GetGsmSMSClient())
104 .WillRepeatedly(Return(mock_gsm_sms_client())); 104 .WillRepeatedly(Return(mock_gsm_sms_client()));
105 EXPECT_CALL(*this, GetImageBurnerClient()) 105 EXPECT_CALL(*this, GetImageBurnerClient())
106 .WillRepeatedly(Return(mock_image_burner_client())); 106 .WillRepeatedly(Return(mock_image_burner_client()));
107 EXPECT_CALL(*this, GetIntrospectableClient()) 107 EXPECT_CALL(*this, GetIntrospectableClient())
108 .WillRepeatedly(Return(mock_introspectable_client())); 108 .WillRepeatedly(Return(mock_introspectable_client()));
109 EXPECT_CALL(*this, GetMediaTransferProtocolDaemonClient()) 109 EXPECT_CALL(*this, GetMediaTransferProtocolDaemonClient())
110 .WillRepeatedly(Return(mock_media_transfer_protocol_daemon_client())); 110 .WillRepeatedly(Return(mock_media_transfer_protocol_daemon_client()));
111 EXPECT_CALL(*this, GetModemMessagingClient()) 111 EXPECT_CALL(*this, GetModemMessagingClient())
112 .WillRepeatedly(Return(mock_modem_messaging_client())); 112 .WillRepeatedly(Return(mock_modem_messaging_client()));
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 // Called from BrightnessController::GetBrightnessPercent as part of ash tray 179 // Called from BrightnessController::GetBrightnessPercent as part of ash tray
180 // initialization. 180 // initialization.
181 EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_)) 181 EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_))
182 .Times(AnyNumber()); 182 .Times(AnyNumber());
183 } 183 }
184 184
185 MockDBusThreadManager::~MockDBusThreadManager() {} 185 MockDBusThreadManager::~MockDBusThreadManager() {}
186 186
187 } // namespace chromeos 187 } // namespace chromeos
OLDNEW
« 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