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

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

Issue 14092002: Move MockUpdateEngineClient::GetLastStatus() expectation to MockDBusThreadManager's ctor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove .Times(AnyNumber()) Created 7 years, 8 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
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 .Times(AnyNumber()); 266 .Times(AnyNumber());
267 267
268 // Called from GeolocationHandler::Init(). 268 // Called from GeolocationHandler::Init().
269 EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_)) 269 EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))
270 .Times(AnyNumber()); 270 .Times(AnyNumber());
271 EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_)) 271 EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_))
272 .Times(AnyNumber()); 272 .Times(AnyNumber());
273 EXPECT_CALL(*mock_shill_manager_client_.get(), 273 EXPECT_CALL(*mock_shill_manager_client_.get(),
274 RemovePropertyChangedObserver(_)) 274 RemovePropertyChangedObserver(_))
275 .Times(AnyNumber()); 275 .Times(AnyNumber());
276
277 // For CrOS browsertests, ChromeBrowserMainPartsChromeos::PostProfileInit()
278 // creates an AutomaticRebootManager which calls the following function.
279 // For unittests, this function won't get called.
280 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
281 .WillRepeatedly(Return(MockUpdateEngineClient::Status()));
276 } 282 }
277 283
278 MockDBusThreadManager::~MockDBusThreadManager() { 284 MockDBusThreadManager::~MockDBusThreadManager() {
279 FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_, 285 FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_,
280 OnDBusThreadManagerDestroying(this)); 286 OnDBusThreadManagerDestroying(this));
281 } 287 }
282 288
283 void MockDBusThreadManager::AddObserver(DBusThreadManagerObserver* observer) { 289 void MockDBusThreadManager::AddObserver(DBusThreadManagerObserver* observer) {
284 DCHECK(observer); 290 DCHECK(observer);
285 observers_.AddObserver(observer); 291 observers_.AddObserver(observer);
286 } 292 }
287 293
288 void MockDBusThreadManager::RemoveObserver( 294 void MockDBusThreadManager::RemoveObserver(
289 DBusThreadManagerObserver* observer) { 295 DBusThreadManagerObserver* observer) {
290 DCHECK(observer); 296 DCHECK(observer);
291 observers_.RemoveObserver(observer); 297 observers_.RemoveObserver(observer);
292 } 298 }
293 299
294 } // namespace chromeos 300 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698