summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_context_builder_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/url_request/url_request_context_builder_unittest.cc')
-rw-r--r--net/url_request/url_request_context_builder_unittest.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc
index 039b15d..8fcb19c 100644
--- a/net/url_request/url_request_context_builder_unittest.cc
+++ b/net/url_request/url_request_context_builder_unittest.cc
@@ -4,12 +4,18 @@
#include "net/url_request/url_request_context_builder.h"
+#include "build/build_config.h"
#include "net/test/test_server.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#if defined(OS_LINUX)
+#include "net/proxy/proxy_config.h"
+#include "net/proxy/proxy_config_service_fixed.h"
+#endif // defined(OS_LINUX)
+
namespace net {
namespace {
@@ -33,7 +39,12 @@ class URLRequestContextBuilderTest : public PlatformTest {
protected:
URLRequestContextBuilderTest()
: test_server_(
- FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))) {}
+ FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))) {
+#if defined(OS_LINUX)
+ builder_.set_proxy_config_service(
+ new ProxyConfigServiceFixed(ProxyConfig::CreateDirect()));
+#endif // defined(OS_LINUX)
+ }
LocalHttpTestServer test_server_;
URLRequestContextBuilder builder_;