commit e05fc28bf8c017174eba39109a806806172902f7
author Andrew de los Reyes <adlr@chromium.org> Thu Jun 02 09:50:08 2011 -0700
committer Andrew de los Reyes <adlr@chromium.org> Thu Jun 02 10:08:39 2011 -0700
tree 07fd0f028787cde7b88fd5d6e15d67c983c86b1a
parent d88a85764b608141adc54f49fdba824919b7d88c

AU: Fixes for gcc-4.6

BUG=chromium-os:15111
TEST=unittests; followed instructions in Issue to compile w/ gcc-4.6

Change-Id: Ia16f9df22c2b85201938efd96799618172301d15
Reviewed-on: http://gerrit.chromium.org/gerrit/1965
Tested-by: Andrew de los Reyes <adlr@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

chrome_proxy_resolver.cc

diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 7d3676b..37ccd8c 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -78,7 +78,10 @@
 DBusGProxy* ChromeProxyResolver::DbusProxy() {
   GError* error = NULL;
   DBusGConnection* bus = dbus_->BusGet(DBUS_BUS_SYSTEM, &error);
-  TEST_AND_RETURN_FALSE(bus);
+  if (!bus) {
+    LOG(ERROR) << "Failed to get System Dbus";
+    return NULL;
+  }
   DBusGProxy* proxy = dbus_->ProxyNewForNameOwner(bus,
                                                   kSessionManagerService,
                                                   kSessionManagerPath,