commit a0b9e777e2c571546bd6ab55356acb023834cbc3
author Darin Petkov <petkov@chromium.org> Thu Oct 06 05:05:56 2011 -0700
committer Darin Petkov <petkov@chromium.org> Thu Oct 06 09:05:51 2011 -0700
tree dc9603c140df69ab5123cd03cb6102da2731b8c7
parent 7ed561bfe6019ed4b988142e97505d7c643e119c

AU: Ensure update_engine_client get proxy retries are spaced out in time.

Hopefully, this will reduce test flakyness. It seems that last time the test
failed all 4 tries happened within a one-second timeframe.

Also, fix GError object memory leaks throughout the code.

BUG=chromium-os:21351
TEST=unit tests, tested on VM

Change-Id: If0bc5d5767d12f3396d0fcb46f3e04ed6d7dfd5c
Reviewed-on: http://gerrit.chromium.org/gerrit/8862
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

chrome_browser_proxy_resolver.cc

diff --git a/chrome_browser_proxy_resolver.cc b/chrome_browser_proxy_resolver.cc
index 8c35afb..7b0bdc6 100644
--- a/chrome_browser_proxy_resolver.cc
+++ b/chrome_browser_proxy_resolver.cc
@@ -60,8 +60,8 @@
                                                  kLibCrosServiceInterface,
                                                  &error);
   if (!proxy) {
-    LOG(ERROR) << "Error getting dbus proxy for "
-               << kLibCrosServiceName << ": " << utils::GetGErrorMessage(error);
+    LOG(ERROR) << "Error getting dbus proxy for " << kLibCrosServiceName << ": "
+               << utils::GetAndFreeGError(&error);
     return NULL;
   }
   return proxy;
@@ -137,7 +137,7 @@
           G_TYPE_STRING, kLibCrosProxyResolveName,
           G_TYPE_INVALID, G_TYPE_INVALID)) {
     LOG(WARNING) << "dbus_g_proxy_call failed: "
-                 << utils::GetGErrorMessage(error)
+                 << utils::GetAndFreeGError(&error)
                  << " Continuing with no proxy.";
     timeout = 0;
   }