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

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

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 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/ibus/mock_ibus_client.h" 8 #include "chromeos/dbus/ibus/mock_ibus_client.h"
9 #include "chromeos/dbus/ibus/mock_ibus_config_client.h" 9 #include "chromeos/dbus/ibus/mock_ibus_config_client.h"
10 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h" 10 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 // Called from AsyncMethodCaller ctor and dtor. 192 // Called from AsyncMethodCaller ctor and dtor.
193 EXPECT_CALL(*mock_cryptohome_client_.get(), SetAsyncCallStatusHandlers(_, _)) 193 EXPECT_CALL(*mock_cryptohome_client_.get(), SetAsyncCallStatusHandlers(_, _))
194 .Times(AnyNumber()); 194 .Times(AnyNumber());
195 EXPECT_CALL(*mock_cryptohome_client_.get(), ResetAsyncCallStatusHandlers()) 195 EXPECT_CALL(*mock_cryptohome_client_.get(), ResetAsyncCallStatusHandlers())
196 .Times(AnyNumber()); 196 .Times(AnyNumber());
197 // Called from various locations. 197 // Called from various locations.
198 EXPECT_CALL(*mock_cryptohome_client_.get(), GetSystemSalt(_)) 198 EXPECT_CALL(*mock_cryptohome_client_.get(), GetSystemSalt(_))
199 .WillRepeatedly(DoAll(SetArgumentPointee<0>(*GetMockSystemSalt()), 199 .WillRepeatedly(DoAll(SetArgumentPointee<0>(*GetMockSystemSalt()),
200 Return(true))); 200 Return(true)));
201 EXPECT_CALL(*mock_cryptohome_client_.get(), TpmIsEnabled(_))
pneubeck (no reviews) 2013/05/13 09:17:06 unrelated change?
stevenjb 2013/05/13 23:49:35 Necessary to avoid Mock errors if we initialize Ne
202 .Times(AnyNumber());
201 203
202 // Called from BrightnessController::GetBrightnessPercent as part of ash tray 204 // Called from BrightnessController::GetBrightnessPercent as part of ash tray
203 // initialization. 205 // initialization.
204 EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_)) 206 EXPECT_CALL(*mock_power_manager_client_.get(), GetScreenBrightnessPercent(_))
205 .Times(AnyNumber()); 207 .Times(AnyNumber());
206 208
207 // Called from GeolocationHandler::Init(). 209 // Called from GeolocationHandler::Init().
208 EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_)) 210 EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))
209 .Times(AnyNumber()); 211 .Times(AnyNumber());
210 EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_)) 212 EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_))
(...skipping 19 matching lines...) Expand all
230 observers_.AddObserver(observer); 232 observers_.AddObserver(observer);
231 } 233 }
232 234
233 void MockDBusThreadManager::RemoveObserver( 235 void MockDBusThreadManager::RemoveObserver(
234 DBusThreadManagerObserver* observer) { 236 DBusThreadManagerObserver* observer) {
235 DCHECK(observer); 237 DCHECK(observer);
236 observers_.RemoveObserver(observer); 238 observers_.RemoveObserver(observer);
237 } 239 }
238 240
239 } // namespace chromeos 241 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698