Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Side by Side Diff: webkit/tools/test_shell/test_shell_request_context.cc

Issue 8944001: net: remove DNS certificate checking code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/url_request/url_request_context_storage.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 storage_.set_http_auth_handler_factory( 86 storage_.set_http_auth_handler_factory(
87 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 87 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
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(), cert_verifier(), 96 new net::HttpCache(host_resolver(),
97 origin_bound_cert_service(), NULL, NULL, 97 cert_verifier(),
98 origin_bound_cert_service(),
99 NULL, // transport_security_state
98 proxy_service(), 100 proxy_service(),
99 "" /* ssl_session_cache_shard */, 101 "", // ssl_session_cache_shard
100 ssl_config_service(), 102 ssl_config_service(),
101 http_auth_handler_factory(), NULL, 103 http_auth_handler_factory(),
102 http_server_properties(), NULL, 104 NULL, // network_delegate
105 http_server_properties(),
106 NULL, // netlog
103 backend); 107 backend);
104 108
105 cache->set_mode(cache_mode); 109 cache->set_mode(cache_mode);
106 storage_.set_http_transaction_factory(cache); 110 storage_.set_http_transaction_factory(cache);
107 111
108 storage_.set_ftp_transaction_factory( 112 storage_.set_ftp_transaction_factory(
109 new net::FtpNetworkLayer(host_resolver())); 113 new net::FtpNetworkLayer(host_resolver()));
110 114
111 blob_storage_controller_.reset(new webkit_blob::BlobStorageController()); 115 blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
112 file_system_context_ = static_cast<SimpleFileSystem*>( 116 file_system_context_ = static_cast<SimpleFileSystem*>(
(...skipping 13 matching lines...) Expand all
126 storage_.set_job_factory(job_factory); 130 storage_.set_job_factory(job_factory);
127 } 131 }
128 132
129 TestShellRequestContext::~TestShellRequestContext() { 133 TestShellRequestContext::~TestShellRequestContext() {
130 } 134 }
131 135
132 const std::string& TestShellRequestContext::GetUserAgent( 136 const std::string& TestShellRequestContext::GetUserAgent(
133 const GURL& url) const { 137 const GURL& url) const {
134 return webkit_glue::GetUserAgent(url); 138 return webkit_glue::GetUserAgent(url);
135 } 139 }
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_storage.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698