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

Side by Side Diff: net/url_request/url_request_unittest.cc

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enforce CalledOnValidThread in all non-static methods. Created 7 years, 6 months 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_test_util.cc ('k') | remoting/host/url_request_context.cc » ('j') | 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) 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 #endif 10 #endif
(...skipping 5070 matching lines...) Expand 10 before | Expand all | Expand 10 after
5081 5081
5082 base::MessageLoop::current()->Run(); 5082 base::MessageLoop::current()->Run();
5083 5083
5084 EXPECT_EQ(1, d.response_started_count()); 5084 EXPECT_EQ(1, d.response_started_count());
5085 } 5085 }
5086 5086
5087 // Now create a new HttpCache with a different ssl_session_cache_shard value. 5087 // Now create a new HttpCache with a different ssl_session_cache_shard value.
5088 HttpNetworkSession::Params params; 5088 HttpNetworkSession::Params params;
5089 params.host_resolver = default_context_.host_resolver(); 5089 params.host_resolver = default_context_.host_resolver();
5090 params.cert_verifier = default_context_.cert_verifier(); 5090 params.cert_verifier = default_context_.cert_verifier();
5091 params.transport_security_state = default_context_.transport_security_state();
5091 params.proxy_service = default_context_.proxy_service(); 5092 params.proxy_service = default_context_.proxy_service();
5092 params.ssl_config_service = default_context_.ssl_config_service(); 5093 params.ssl_config_service = default_context_.ssl_config_service();
5093 params.http_auth_handler_factory = 5094 params.http_auth_handler_factory =
5094 default_context_.http_auth_handler_factory(); 5095 default_context_.http_auth_handler_factory();
5095 params.network_delegate = &default_network_delegate_; 5096 params.network_delegate = &default_network_delegate_;
5096 params.http_server_properties = default_context_.http_server_properties(); 5097 params.http_server_properties = default_context_.http_server_properties();
5097 params.ssl_session_cache_shard = "alternate"; 5098 params.ssl_session_cache_shard = "alternate";
5098 5099
5099 scoped_ptr<net::HttpCache> cache(new net::HttpCache( 5100 scoped_ptr<net::HttpCache> cache(new net::HttpCache(
5100 new net::HttpNetworkSession(params), 5101 new net::HttpNetworkSession(params),
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
5846 5847
5847 EXPECT_FALSE(r.is_pending()); 5848 EXPECT_FALSE(r.is_pending());
5848 EXPECT_EQ(1, d->response_started_count()); 5849 EXPECT_EQ(1, d->response_started_count());
5849 EXPECT_FALSE(d->received_data_before_response()); 5850 EXPECT_FALSE(d->received_data_before_response());
5850 EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); 5851 EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
5851 } 5852 }
5852 } 5853 }
5853 #endif // !defined(DISABLE_FTP_SUPPORT) 5854 #endif // !defined(DISABLE_FTP_SUPPORT)
5854 5855
5855 } // namespace net 5856 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_test_util.cc ('k') | remoting/host/url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698