diff options
12 files changed, 50 insertions, 23 deletions
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc index 3fd8969..39fce94 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc +++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc @@ -249,9 +249,13 @@ void BluetoothDevice::Connect(PairingDelegate* pairing_delegate, agent_path_basename); dbus::Bus* system_bus = DBusThreadManager::Get()->GetSystemBus(); - agent_.reset(BluetoothAgentServiceProvider::Create(system_bus, - agent_path, - this)); + if (system_bus) { + agent_.reset(BluetoothAgentServiceProvider::Create(system_bus, + agent_path, + this)); + } else { + agent_.reset(NULL); + } DVLOG(1) << "Pairing: " << address_; DBusThreadManager::Get()->GetBluetoothAdapterClient()-> diff --git a/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc b/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc index a2bc652..811e955 100644 --- a/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc +++ b/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc @@ -155,6 +155,8 @@ class CrosNetworkFunctionsTest : public testing::Test { virtual void SetUp() { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); mock_cashew_client_ = mock_dbus_thread_manager->mock_cashew_client(); mock_device_client_ = diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc index 7f821e3..b9a4d83 100644 --- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc @@ -105,8 +105,8 @@ void CrosDBusService::Initialize() { LOG(WARNING) << "CrosDBusService was already initialized"; return; } - if (base::chromeos::IsRunningOnChromeOS()) { - dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus(); + dbus::Bus* bus = DBusThreadManager::Get()->GetSystemBus(); + if (base::chromeos::IsRunningOnChromeOS() && bus) { CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); g_cros_dbus_service = service; diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc index 78c040a..0b98dd6 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc @@ -52,6 +52,8 @@ class KioskModeScreensaverTest : public testing::Test { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); MockPowerManagerClient* power_manager = diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index c55d050..cbbb56f 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -110,6 +110,8 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); cros_mock_->InitStatusAreaMocks(); diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc index d426953..40185b4 100644 --- a/chrome/browser/chromeos/login/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc @@ -52,6 +52,8 @@ class NetworkScreenTest : public WizardInProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); cros_mock_->InitStatusAreaMocks(); mock_network_library_ = cros_mock_->mock_network_library(); diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index c9f2d14..0d450c2 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -317,6 +317,8 @@ TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); EXPECT_CALL(*mock_dbus_thread_manager->mock_cryptohome_client(), Unmount(_)) .WillOnce(DoAll(SetArgPointee<0>(true), Return(true))); diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 97fa70b..b310186 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -105,6 +105,8 @@ class ScreenLockerTest : public CrosInProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(testing::Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); mock_power_manager_client_ = static_cast<MockPowerManagerClient*>( diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc index 293c1ff..24ed1a6 100644 --- a/chrome/browser/chromeos/login/update_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc @@ -37,6 +37,8 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { virtual void SetUpInProcessBrowserTestFixture() { MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager; + EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); cros_mock_->InitStatusAreaMocks(); diff --git a/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc index 5a01f0d..093803f 100644 --- a/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc +++ b/chrome/browser/chromeos/settings/signed_settings_helper_unittest.cc @@ -25,6 +25,7 @@ using ::testing::_; using ::testing::A; using ::testing::InSequence; using ::testing::Invoke; +using ::testing::Return; using ::testing::WithArg; namespace em = enterprise_management; @@ -46,6 +47,8 @@ class SignedSettingsHelperTest : public testing::Test, virtual void SetUp() { SignedSettingsHelper::Get()->set_test_delegate(this); + EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); fake_policy_data_ = BuildPolicyData(); diff --git a/chrome/browser/chromeos/settings/signed_settings_unittest.cc b/chrome/browser/chromeos/settings/signed_settings_unittest.cc index 0765f91..2ffa0c8 100644 --- a/chrome/browser/chromeos/settings/signed_settings_unittest.cc +++ b/chrome/browser/chromeos/settings/signed_settings_unittest.cc @@ -118,6 +118,8 @@ class SignedSettingsTest : public testing::Test { virtual void SetUp() { file_thread_.Start(); + EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus()) + .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL))); DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_); } diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index d3f2311..c38a4ca 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -240,12 +240,14 @@ OutputConfigurator::OutputConfigurator(bool is_extended_display_enabled) // Note that this can be removed once the legacy powerd support is removed. chromeos::DBusThreadManager* manager = chromeos::DBusThreadManager::Get(); dbus::Bus* bus = manager->GetSystemBus(); - dbus::ExportedObject* remote_object = bus->GetExportedObject( - dbus::ObjectPath(power_manager::kPowerManagerServicePath)); - dbus::Signal signal(power_manager::kPowerManagerInterface, - power_manager::kUseNewMonitorConfigSignal); - CHECK(signal.raw_message() != NULL); - remote_object->SendSignal(&signal); + if (bus) { + dbus::ExportedObject* remote_object = bus->GetExportedObject( + dbus::ObjectPath(power_manager::kPowerManagerServicePath)); + dbus::Signal signal(power_manager::kPowerManagerInterface, + power_manager::kUseNewMonitorConfigSignal); + CHECK(signal.raw_message() != NULL); + remote_object->SendSignal(&signal); + } // Cache the initial output state. Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay(); @@ -843,18 +845,20 @@ void OutputConfigurator::CheckIsProjectingAndNotify() { bool is_projecting = has_internal_output && (connected_output_count > 1); chromeos::DBusThreadManager* manager = chromeos::DBusThreadManager::Get(); dbus::Bus* bus = manager->GetSystemBus(); - dbus::ObjectProxy* power_manager_proxy = bus->GetObjectProxy( - power_manager::kPowerManagerServiceName, - dbus::ObjectPath(power_manager::kPowerManagerServicePath)); - dbus::MethodCall method_call( - power_manager::kPowerManagerInterface, - power_manager::kSetIsProjectingMethod); - dbus::MessageWriter writer(&method_call); - writer.AppendBool(is_projecting); - power_manager_proxy->CallMethod( - &method_call, - dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, - dbus::ObjectProxy::EmptyResponseCallback()); + if (bus) { + dbus::ObjectProxy* power_manager_proxy = bus->GetObjectProxy( + power_manager::kPowerManagerServiceName, + dbus::ObjectPath(power_manager::kPowerManagerServicePath)); + dbus::MethodCall method_call( + power_manager::kPowerManagerInterface, + power_manager::kSetIsProjectingMethod); + dbus::MessageWriter writer(&method_call); + writer.AppendBool(is_projecting); + power_manager_proxy->CallMethod( + &method_call, + dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, + dbus::ObjectProxy::EmptyResponseCallback()); + } } void OutputConfigurator::NotifyOnDisplayChanged() { |