| 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 "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 2107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2118 | 2118 |
| 2119 MessageLoop::current()->Run(); | 2119 MessageLoop::current()->Run(); |
| 2120 | 2120 |
| 2121 EXPECT_EQ(1, d.response_started_count()); | 2121 EXPECT_EQ(1, d.response_started_count()); |
| 2122 } | 2122 } |
| 2123 | 2123 |
| 2124 // Now create a new HttpCache with a different ssl_session_cache_shard value. | 2124 // Now create a new HttpCache with a different ssl_session_cache_shard value. |
| 2125 HttpNetworkSession::Params params; | 2125 HttpNetworkSession::Params params; |
| 2126 params.host_resolver = default_context_.host_resolver(); | 2126 params.host_resolver = default_context_.host_resolver(); |
| 2127 params.cert_verifier = default_context_.cert_verifier(); | 2127 params.cert_verifier = default_context_.cert_verifier(); |
| 2128 params.server_bound_cert_service = |
| 2129 default_context_.server_bound_cert_service(); |
| 2128 params.proxy_service = default_context_.proxy_service(); | 2130 params.proxy_service = default_context_.proxy_service(); |
| 2129 params.ssl_config_service = default_context_.ssl_config_service(); | 2131 params.ssl_config_service = default_context_.ssl_config_service(); |
| 2130 params.http_auth_handler_factory = | 2132 params.http_auth_handler_factory = |
| 2131 default_context_.http_auth_handler_factory(); | 2133 default_context_.http_auth_handler_factory(); |
| 2132 params.network_delegate = default_context_.network_delegate(); | 2134 params.network_delegate = default_context_.network_delegate(); |
| 2133 params.http_server_properties = default_context_.http_server_properties(); | 2135 params.http_server_properties = default_context_.http_server_properties(); |
| 2134 params.ssl_session_cache_shard = "alternate"; | 2136 params.ssl_session_cache_shard = "alternate"; |
| 2135 | 2137 |
| 2136 scoped_ptr<net::HttpCache> cache(new net::HttpCache( | 2138 scoped_ptr<net::HttpCache> cache(new net::HttpCache( |
| 2137 new net::HttpNetworkSession(params), | 2139 new net::HttpNetworkSession(params), |
| (...skipping 2543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4681 req.SetExtraRequestHeaders(headers); | 4683 req.SetExtraRequestHeaders(headers); |
| 4682 req.Start(); | 4684 req.Start(); |
| 4683 MessageLoop::current()->Run(); | 4685 MessageLoop::current()->Run(); |
| 4684 // If the net tests are being run with ChromeFrame then we need to allow for | 4686 // If the net tests are being run with ChromeFrame then we need to allow for |
| 4685 // the 'chromeframe' suffix which is added to the user agent before the | 4687 // the 'chromeframe' suffix which is added to the user agent before the |
| 4686 // closing parentheses. | 4688 // closing parentheses. |
| 4687 EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true)); | 4689 EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true)); |
| 4688 } | 4690 } |
| 4689 | 4691 |
| 4690 } // namespace net | 4692 } // namespace net |
| OLD | NEW |