Move ProxyConfigService construction onto the IO thread.

net/tools/get_server_time/get_server_time.cc

Index: net/tools/get_server_time/get_server_time.cc
diff --git a/net/tools/get_server_time/get_server_time.cc b/net/tools/get_server_time/get_server_time.cc
index 3bbe271612a7b21ffe17e411a028440e01167501..1718004580728d4903b3956e40e711192502074b 100644
--- a/net/tools/get_server_time/get_server_time.cc
+++ b/net/tools/get_server_time/get_server_time.cc
@@ -41,6 +41,10 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#include <glib-object.h>
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #elif defined(OS_LINUX)
@@ -170,15 +174,11 @@ class PrintingLog : public net::NetLog {
 };
 
 // Builds a URLRequestContext assuming there's only a single loop.
-scoped_ptr<net::URLRequestContext> BuildURLRequestContext() {
+scoped_ptr<net::URLRequestContext> BuildURLRequestContext(
+    const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner) {
   net::URLRequestContextBuilder builder;
 #if defined(OS_LINUX)
-  // On Linux, use a fixed ProxyConfigService, since the default one
-  // depends on glib.
-  //
-  // TODO(akalin): Remove this once http://crbug.com/146421 is fixed.
-  builder.set_proxy_config_service(
-      new net::ProxyConfigServiceFixed(net::ProxyConfig()));
+  builder.set_glib_task_runner(main_task_runner);
 #endif
   scoped_ptr<net::URLRequestContext> context(builder.Build());
   context->set_net_log(new PrintingLog());
@@ -191,7 +191,7 @@ class SingleThreadRequestContextGetter : public net::URLRequestContextGetter {
   // about when |context_| gets created.
   explicit SingleThreadRequestContextGetter(
       const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner)
-      : context_(BuildURLRequestContext()),
+      : context_(BuildURLRequestContext(main_task_runner)),
         main_task_runner_(main_task_runner) {}
 
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
@@ -252,6 +252,11 @@ int main(int argc, char* argv[]) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
+#if defined(OS_LINUX) || defined(OS_OPENBSD)
+  // Needed so ProxyConfigServiceLinux can use gconf.
+  // Normally handled by BrowserMainLoop::InitializeToolkit().
+  g_type_init();
+#endif
 
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);