AU: Handle inability to get proxy servers from Chrome better.

chrome_browser_proxy_resolver.cc

 // Copyright (c) 2011 The Chromium OS 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 "update_engine/chrome_browser_proxy_resolver.h"
 
 #include <map>
 #include <string>
 
 #include <base/string_tokenizer.h>
@@ skipping 110 matching lines @@
        ++it) {
     g_source_destroy(it->second);
     it->second = NULL;
   }
 }
 
 bool ChromeBrowserProxyResolver::GetProxiesForUrl(const string& url,
                                                   ProxiesResolvedFn callback,
                                                   void* data) {
   GError* error = NULL;
-  TEST_AND_RETURN_FALSE(proxy_);
-  if (!dbus_->ProxyCall(
+  guint timeout = timeout_;
+  if (!proxy_ || !dbus_->ProxyCall(
           proxy_,
           kLibCrosServiceResolveNetworkProxyMethodName,
           &error,
           G_TYPE_STRING, url.c_str(),
           G_TYPE_STRING, kLibCrosProxyResolveSignalInterface,
           G_TYPE_STRING, kLibCrosProxyResolveName,
           G_TYPE_INVALID, G_TYPE_INVALID)) {
     LOG(ERROR) << "dbus_g_proxy_call failed: "

[petkov, 2011/03/14 19:58:10]

Change to WARNING?

-               << utils::GetGErrorMessage(error);
-    return false;
+               << utils::GetGErrorMessage(error)
+               << " Continuing with no proxy.";
+    timeout = 0;
   }
   callbacks_.insert(make_pair(url, make_pair(callback, data)));
   Closure* closure = NewCallback(this,
                                  &ChromeBrowserProxyResolver::HandleTimeout,
                                  url);
-  GSource* timer = g_timeout_source_new_seconds(timeout_);
+  GSource* timer = g_timeout_source_new_seconds(timeout);
   g_source_set_callback(timer, &utils::GlibRunClosure, closure, NULL);
   g_source_attach(timer, NULL);
   timers_.insert(make_pair(url, timer));
   return true;
 }
 
 DBusHandlerResult ChromeBrowserProxyResolver::FilterMessage(
     DBusConnection* connection,
     DBusMessage* message) {
   // Code lifted from libcros.
@@ skipping 100 matching lines @@
     if (scheme != "direct" && host_and_port.empty())
       continue;  // Must supply host/port when non-direct proxy used.
     ret.push_back(scheme + "://" + host_and_port);
   }
   if (ret.empty() || *ret.rbegin() != kNoProxy)
     ret.push_back(kNoProxy);
   return ret;
 }
 
 }  // namespace chromeos_update_engine