AU: Make proxy resolution asynchronous.

chrome_proxy_resolver_unittest.cc

 // Copyright (c) 2009 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 <deque>
 #include <string>
 
 #include <gtest/gtest.h>
 
 #include "update_engine/chrome_proxy_resolver.h"
@@ skipping 63 matching lines @@
                                                      &out));
   
   // Bad proxy scheme
   EXPECT_TRUE(resolver.GetProxiesForUrlWithSettings("http://foo.com",
                                                     "{\"mode\":1}",
                                                     &out));
   EXPECT_EQ(1, out.size());
   EXPECT_EQ(kNoProxy, out[0]);
 }
 
+namespace {
+void DbusInterfaceTestResolved(const std::deque<std::string>& proxies,
+                               void* data) {
+  EXPECT_EQ(2, proxies.size());
+  EXPECT_EQ("socks5://192.168.52.83:5555", proxies[0]);
+  EXPECT_EQ(kNoProxy, proxies[1]);
+  g_main_loop_quit(reinterpret_cast<GMainLoop*>(data));
+}
+}
+
 TEST(ChromeProxyResolverTest, DbusInterfaceTest) {
   long number = 1;
   DBusGConnection* kMockSystemBus =
       reinterpret_cast<DBusGConnection*>(number++);
   DBusGProxy* kMockSessionManagerProxy =
       reinterpret_cast<DBusGProxy*>(number++);
 
   const char settings[] = 
       "{\"mode\":4,\"socks\":{\"server\":\"socks5://192.168.52.83:5555\","
       "\"src\":0}}";
@@ skipping 18 matching lines @@
       StrEq(kSessionManagerRetrievePropertyMethod),
       _,
       G_TYPE_STRING, StrEq(kSessionManagerProxySettingsKey),
       G_TYPE_INVALID,
       G_TYPE_STRING, _,
       DBUS_TYPE_G_UCHAR_ARRAY, _))
       .WillOnce(DoAll(SetArgumentPointee<7>(strdup(settings)),
                       SetArgumentPointee<9>(ret_array),
                       Return(TRUE)));
 
-  deque<string> proxies;
+  GMainLoop* loop = g_main_loop_new(g_main_context_default(), FALSE);
+
   EXPECT_TRUE(resolver.GetProxiesForUrl("http://user:pass@foo.com:22",
-                                        &proxies));
-  EXPECT_EQ(2, proxies.size());
-  EXPECT_EQ("socks5://192.168.52.83:5555", proxies[0]);
-  EXPECT_EQ(kNoProxy, proxies[1]);
+                                        &DbusInterfaceTestResolved,
+                                        loop));
+  g_main_loop_run(loop);
+  g_main_loop_unref(loop);
 }
 
 TEST(ChromeProxyResolverTest, GetProxyTypeTest) {
   curl_proxytype type;
   EXPECT_TRUE(ChromeProxyResolver::GetProxyType("socks://f.ru", &type));
   EXPECT_EQ(CURLPROXY_SOCKS5_HOSTNAME, type);
   EXPECT_TRUE(ChromeProxyResolver::GetProxyType("socks5://f.ru:9", &type));
   EXPECT_EQ(CURLPROXY_SOCKS5_HOSTNAME, type);
   EXPECT_TRUE(ChromeProxyResolver::GetProxyType("socks4://f.ru:9", &type));
   EXPECT_EQ(CURLPROXY_SOCKS4A, type);
   EXPECT_TRUE(ChromeProxyResolver::GetProxyType("http://f.no:88", &type));
   EXPECT_EQ(CURLPROXY_HTTP, type);
   EXPECT_TRUE(ChromeProxyResolver::GetProxyType("https://f.no:88", &type));
   EXPECT_EQ(CURLPROXY_HTTP, type);
   EXPECT_FALSE(ChromeProxyResolver::GetProxyType(kNoProxy, &type));
   EXPECT_FALSE(ChromeProxyResolver::GetProxyType("foo://", &type));
   EXPECT_FALSE(ChromeProxyResolver::GetProxyType("missing.com:8", &type));
 }
 
 }  // namespace chromeos_update_engine