diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:29:52 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 20:29:52 +0000 |
| commit | 693d0144003f6dc825994efdd39b27dfcac81166 (patch) | |
| tree | b7ec02364aab7b07ca5219c979391783c047bebd /chrome/browser/chromeos/dbus | |
| parent | 2e78f92ee0d23210d77ff4f4895501ca8f9d2db6 (diff) | |
| download | chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.zip chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.tar.gz chromium_src-693d0144003f6dc825994efdd39b27dfcac81166.tar.bz2 | |
Fixes for handling of MockDBusThreadManager::GetSystemBus().
This is a patch taken over from zel's original patch:
http://codereview.chromium.org/10832258/
BUG=131915
TEST=NetworkScreenTest.* and number of other tests should start passing in BVT CrOS tests
TBR=zelidrag@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10854121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dbus')
| -rw-r--r-- | chrome/browser/chromeos/dbus/cros_dbus_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; |