Fixes for handling of MockDBusThreadManager::GetSystemBus().

chromeos/display/output_configurator.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/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
 
@@ skipping 222 matching lines @@
       secondary_output_index_(-1),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID) {
   if (!is_running_on_chrome_os_)
     return;
   // Send the signal to powerd to tell it that we will take over output
   // control.
   // 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();
   CHECK(display != NULL);
   XGrabServer(display);
   Window window = DefaultRootWindow(display);
   XRRScreenResources* screen = XRRGetScreenResources(display, window);
   CHECK(screen != NULL);
   bool did_detect_outputs = TryRecacheOutputs(display, screen);
   CHECK(did_detect_outputs);
@@ skipping 577 matching lines @@
       connected_output_count += 1;
       has_internal_output |= output_cache_[i].is_internal;
     }
   }
 
   // "Projecting" is defined as having more than 1 output connected while at
   // least one of them is an internal output.
   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() {
   FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChanged());
 }
 
 }  // namespace chromeos