Added more default expectations to MockDBusThreadManager.

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/mock_bluetooth_adapter_client.h"
 #include "chromeos/dbus/mock_bluetooth_device_client.h"
 #include "chromeos/dbus/mock_bluetooth_input_client.h"
@@ skipping 44 matching lines @@
       mock_shill_service_client_(new MockShillServiceClient),
       mock_gsm_sms_client_(new MockGsmSMSClient),
       mock_image_burner_client_(new MockImageBurnerClient),
       mock_introspectable_client_(new MockIntrospectableClient),
       mock_modem_messaging_client_(new MockModemMessagingClient),
       mock_permission_broker_client_(new MockPermissionBrokerClient),
       mock_power_manager_client_(new MockPowerManagerClient),
       mock_session_manager_client_(new MockSessionManagerClient),
       mock_sms_client_(new MockSMSClient),
       mock_speech_synthesizer_client_(new MockSpeechSynthesizerClient),
-      mock_update_engine_client_(new MockUpdateEngineClient),
-      power_policy_controller_(ALLOW_THIS_IN_INITIALIZER_LIST(
-          new PowerPolicyController(this, mock_power_manager_client_.get()))) {
+      mock_update_engine_client_(new MockUpdateEngineClient) {
   EXPECT_CALL(*this, GetBluetoothAdapterClient())
       .WillRepeatedly(Return(mock_bluetooth_adapter_client_.get()));
   EXPECT_CALL(*this, GetBluetoothDeviceClient())
       .WillRepeatedly(Return(mock_bluetooth_device_client_.get()));
   EXPECT_CALL(*this, GetBluetoothInputClient())
       .WillRepeatedly(Return(mock_bluetooth_input_client_.get()));
   EXPECT_CALL(*this, GetBluetoothManagerClient())
       .WillRepeatedly(Return(mock_bluetooth_manager_client()));
   EXPECT_CALL(*this, GetBluetoothNodeClient())
       .WillRepeatedly(Return(mock_bluetooth_node_client_.get()));
@@ skipping 18 matching lines @@
   EXPECT_CALL(*this, GetGsmSMSClient())
       .WillRepeatedly(Return(mock_gsm_sms_client()));
   EXPECT_CALL(*this, GetImageBurnerClient())
       .WillRepeatedly(Return(mock_image_burner_client()));
   EXPECT_CALL(*this, GetIntrospectableClient())
       .WillRepeatedly(Return(mock_introspectable_client()));
   EXPECT_CALL(*this, GetModemMessagingClient())
       .WillRepeatedly(Return(mock_modem_messaging_client()));
   EXPECT_CALL(*this, GetPowerManagerClient())
       .WillRepeatedly(Return(mock_power_manager_client_.get()));
-  EXPECT_CALL(*this, GetPowerPolicyController())
-      .WillRepeatedly(Return(power_policy_controller_.get()));
   EXPECT_CALL(*this, GetSessionManagerClient())
       .WillRepeatedly(Return(mock_session_manager_client_.get()));
   EXPECT_CALL(*this, GetSMSClient())
       .WillRepeatedly(Return(mock_sms_client_.get()));
   EXPECT_CALL(*this, GetSpeechSynthesizerClient())
       .WillRepeatedly(Return(mock_speech_synthesizer_client_.get()));
   EXPECT_CALL(*this, GetUpdateEngineClient())
       .WillRepeatedly(Return(mock_update_engine_client_.get()));
   EXPECT_CALL(*this, GetIBusInputContextClient())
       .WillRepeatedly(ReturnNull());
 
   EXPECT_CALL(*this, GetSystemBus())
       .WillRepeatedly(ReturnNull());
   EXPECT_CALL(*this, GetIBusBus())
       .WillRepeatedly(ReturnNull());
 
-  // These observers calls are used in ChromeBrowserMainPartsChromeos.
+  // |power_policy_controller_| calls some of these from the constructor, so
+  // set these expectations before creating the controller.
   EXPECT_CALL(*mock_power_manager_client_.get(), AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_power_manager_client_.get(), RemoveObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_power_manager_client_.get(), NotifyUserActivity(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_power_manager_client_.get(), NotifyVideoActivity(_, _))
       .Times(AnyNumber());
+  EXPECT_CALL(*mock_power_manager_client_.get(), SetPolicy(_))
+      .Times(AnyNumber());
+  power_policy_controller_.reset(
+      new PowerPolicyController(this, mock_power_manager_client_.get()));
+  EXPECT_CALL(*this, GetPowerPolicyController())
+      .WillRepeatedly(Return(power_policy_controller_.get()));
+
+  // These observers calls are used in ChromeBrowserMainPartsChromeos.
   EXPECT_CALL(*mock_session_manager_client_.get(), AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_session_manager_client_.get(), RemoveObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_session_manager_client_.get(), HasObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_update_engine_client_.get(), AddObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_update_engine_client_.get(), RemoveObserver(_))
       .Times(AnyNumber());
@@ skipping 64 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void MockDBusThreadManager::RemoveObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace chromeos