| Index: net/proxy/proxy_service.cc
|
| ===================================================================
|
| --- net/proxy/proxy_service.cc (revision 12719)
|
| +++ net/proxy/proxy_service.cc (working copy)
|
| @@ -19,6 +19,8 @@
|
| #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"
|
| @@ -205,12 +207,8 @@
|
| 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
|
| }
|
|
|
| @@ -230,9 +228,7 @@
|
| #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.
|
|
|