OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/tools/test_shell/test_shell_request_context.h" | 5 #include "webkit/tools/test_shell/test_shell_request_context.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 bool no_proxy) | 42 bool no_proxy) |
43 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { | 43 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { |
44 Init(cache_path, cache_mode, no_proxy); | 44 Init(cache_path, cache_mode, no_proxy); |
45 } | 45 } |
46 | 46 |
47 void TestShellRequestContext::Init( | 47 void TestShellRequestContext::Init( |
48 const FilePath& cache_path, | 48 const FilePath& cache_path, |
49 net::HttpCache::Mode cache_mode, | 49 net::HttpCache::Mode cache_mode, |
50 bool no_proxy) { | 50 bool no_proxy) { |
51 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 51 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
52 storage_.set_origin_bound_cert_service(new net::OriginBoundCertService( | 52 storage_.set_server_bound_cert_service(new net::ServerBoundCertService( |
53 new net::DefaultOriginBoundCertStore(NULL))); | 53 new net::DefaultServerBoundCertStore(NULL))); |
54 | 54 |
55 // hard-code A-L and A-C for test shells | 55 // hard-code A-L and A-C for test shells |
56 set_accept_language("en-us,en"); | 56 set_accept_language("en-us,en"); |
57 set_accept_charset("iso-8859-1,*,utf-8"); | 57 set_accept_charset("iso-8859-1,*,utf-8"); |
58 | 58 |
59 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 59 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
60 // Use no proxy to avoid ProxyConfigServiceLinux. | 60 // Use no proxy to avoid ProxyConfigServiceLinux. |
61 // Enabling use of the ProxyConfigServiceLinux requires: | 61 // Enabling use of the ProxyConfigServiceLinux requires: |
62 // -Calling from a thread with a TYPE_UI MessageLoop, | 62 // -Calling from a thread with a TYPE_UI MessageLoop, |
63 // -If at all possible, passing in a pointer to the IO thread's MessageLoop, | 63 // -If at all possible, passing in a pointer to the IO thread's MessageLoop, |
(...skipping 24 matching lines...) Expand all Loading... |
88 storage_.set_http_server_properties( | 88 storage_.set_http_server_properties( |
89 new net::HttpServerPropertiesImpl); | 89 new net::HttpServerPropertiesImpl); |
90 | 90 |
91 net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend( | 91 net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend( |
92 cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, | 92 cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE, |
93 cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread()); | 93 cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread()); |
94 | 94 |
95 net::HttpCache* cache = | 95 net::HttpCache* cache = |
96 new net::HttpCache(host_resolver(), | 96 new net::HttpCache(host_resolver(), |
97 cert_verifier(), | 97 cert_verifier(), |
98 origin_bound_cert_service(), | 98 server_bound_cert_service(), |
99 NULL, // transport_security_state | 99 NULL, // transport_security_state |
100 proxy_service(), | 100 proxy_service(), |
101 "", // ssl_session_cache_shard | 101 "", // ssl_session_cache_shard |
102 ssl_config_service(), | 102 ssl_config_service(), |
103 http_auth_handler_factory(), | 103 http_auth_handler_factory(), |
104 NULL, // network_delegate | 104 NULL, // network_delegate |
105 http_server_properties(), | 105 http_server_properties(), |
106 NULL, // netlog | 106 NULL, // netlog |
107 backend); | 107 backend); |
108 | 108 |
(...skipping 21 matching lines...) Expand all Loading... |
130 storage_.set_job_factory(job_factory); | 130 storage_.set_job_factory(job_factory); |
131 } | 131 } |
132 | 132 |
133 TestShellRequestContext::~TestShellRequestContext() { | 133 TestShellRequestContext::~TestShellRequestContext() { |
134 } | 134 } |
135 | 135 |
136 const std::string& TestShellRequestContext::GetUserAgent( | 136 const std::string& TestShellRequestContext::GetUserAgent( |
137 const GURL& url) const { | 137 const GURL& url) const { |
138 return webkit_glue::GetUserAgent(url); | 138 return webkit_glue::GetUserAgent(url); |
139 } | 139 } |
OLD | NEW |