Fixes for handling of MockDBusThreadManager::GetSystemBus().

chrome/browser/chromeos/dbus/cros_dbus_service.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 "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
@@ skipping 87 matching lines @@
   virtual ~CrosDBusServiceStubImpl() {
   }
 };
 
 // static
 void CrosDBusService::Initialize() {
   if (g_cros_dbus_service) {
     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;
     service->Start();
   } else {
     g_cros_dbus_service = new CrosDBusServiceStubImpl;
   }
   VLOG(1) << "CrosDBusService initialized";
 }
 
@@ skipping 19 matching lines @@
   VLOG(1) << "CrosDBusService Shutdown completed";
 }
 
 CrosDBusService::~CrosDBusService() {
 }
 
 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
 }
 
 }  // namespace chromeos