Proxy config for Linux (ProxyConfigServiceLinux)...

net/proxy/proxy_service.cc

 // Copyright (c) 2006-2008 The Chromium 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 "net/proxy/proxy_service.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #if defined(OS_WIN)
 #include "net/proxy/proxy_config_service_win.h"
 #include "net/proxy/proxy_resolver_winhttp.h"
 #elif defined(OS_MACOSX)
 #include "net/proxy/proxy_resolver_mac.h"
+#elif defined(OS_LINUX)
+#include "net/proxy/proxy_config_service_linux.h"
 #endif
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_resolver_v8.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace net {
 
 // Config getter that fails every time.
@@ skipping 166 matching lines @@
     // (because the configuration will never require PAC).
     return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL);
   }
 #if defined(OS_WIN)
   return new ProxyService(new ProxyConfigServiceWin(),
                           new ProxyResolverWinHttp());
 #elif defined(OS_MACOSX)
   return new ProxyService(new ProxyConfigServiceMac(),
                           new ProxyResolverMac());
 #else
-  // TODO(port): implement ProxyConfigServiceLinux as well as make use of
-  // ProxyResolverV8 once it's implemented.
-  // See:
-  // - http://code.google.com/p/chromium/issues/detail?id=8143
-  // - http://code.google.com/p/chromium/issues/detail?id=2764
-  return CreateNull();
+  return new ProxyService(new ProxyConfigServiceLinux(),
+                          new ProxyResolverV8());
 #endif
 }
 
 // static
 ProxyService* ProxyService::CreateUsingV8Resolver(
     const ProxyInfo* pi, URLRequestContext* url_request_context) {
   if (pi) {
     // The ProxyResolver is set to NULL, since it should never be called
     // (because the configuration will never require PAC).
     return new ProxyService(new ProxyConfigServiceFixed(*pi), NULL);
   }
 
   // Choose the system configuration service appropriate for each platform.
   ProxyConfigService* config_service;
 #if defined(OS_WIN)
   config_service = new ProxyConfigServiceWin();
 #elif defined(OS_MACOSX)
   config_service = new ProxyConfigServiceMac();
 #else
-  // TODO(port): implement ProxyConfigServiceLinux.
-  // See: http://code.google.com/p/chromium/issues/detail?id=8143
-  return CreateNull();
+  config_service = new ProxyConfigServiceLinux();
 #endif
 
   // Create a ProxyService that uses V8 to evaluate PAC scripts.
   ProxyService* proxy_service = new ProxyService(
       config_service, new ProxyResolverV8());
 
   // Configure PAC script downloads to be issued using |url_request_context|.
   proxy_service->SetProxyScriptFetcher(
       ProxyScriptFetcher::Create(url_request_context));
 
@@ skipping 415 matching lines @@
     OnCompletion(result_);
   }
 }
 
 void SyncProxyServiceHelper::OnCompletion(int rv) {
   result_ = rv;
   event_.Signal();
 }
 
 }  // namespace net