Move MockUpdateEngineClient::GetLastStatus() expectation to MockDBusThreadManager's ctor

chromeos/dbus/mock_dbus_thread_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_config_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
@@ skipping 255 matching lines @@
       .Times(AnyNumber());
 
   // Called from GeolocationHandler::Init().
   EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_shill_manager_client_.get(),
               RemovePropertyChangedObserver(_))
       .Times(AnyNumber());
+
+  // For CrOS browsertests, ChromeBrowserMainPartsChromeos::PostProfileInit()
+  // creates an AutomaticRebootManager which calls the following function.
+  // For unittests, this function won't get called.
+  EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())
+      .Times(AnyNumber())

[Daniel Erat, 2013/04/10 20:06:00]

nit: is this .Times(AnyNumber()) necessary?  i think you may be able to leave it
out -- i'd expect WillRepeatedly() to imply it

[Yufeng Shen (Slow to review), 2013/04/10 20:29:21]

Done.

+      .WillRepeatedly(Return(MockUpdateEngineClient::Status()));
 }
 
 MockDBusThreadManager::~MockDBusThreadManager() {
   FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_,
                     OnDBusThreadManagerDestroying(this));
 }
 
 void MockDBusThreadManager::AddObserver(DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void MockDBusThreadManager::RemoveObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace chromeos