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

Side by Side Diff: chrome_frame/test/test_server_test.cc

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 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 | « chrome_frame/metrics_service.cc ('k') | jingle/notifier/base/chrome_async_socket.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <windows.h> 5 #include <windows.h>
6 #include <wininet.h> 6 #include <wininet.h>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_handle_win.h" 10 #include "base/scoped_handle_win.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 URLRequestTestContext() { 63 URLRequestTestContext() {
64 host_resolver_ = 64 host_resolver_ =
65 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, 65 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
66 NULL); 66 NULL);
67 proxy_service_ = net::ProxyService::CreateDirect(); 67 proxy_service_ = net::ProxyService::CreateDirect();
68 ssl_config_service_ = new net::SSLConfigServiceDefaults; 68 ssl_config_service_ = new net::SSLConfigServiceDefaults;
69 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault( 69 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
70 host_resolver_); 70 host_resolver_);
71 http_transaction_factory_ = new net::HttpCache( 71 http_transaction_factory_ = new net::HttpCache(
72 net::HttpNetworkLayer::CreateFactory( 72 net::HttpNetworkLayer::CreateFactory(
73 host_resolver_, NULL /* dnsrr_resolver */, 73 host_resolver_, NULL /* dnsrr_resolver */, proxy_service_,
74 NULL /* ssl_host_info_factory */, proxy_service_,
75 ssl_config_service_, http_auth_handler_factory_, NULL, NULL), 74 ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
76 net::HttpCache::DefaultBackend::InMemory(0)); 75 net::HttpCache::DefaultBackend::InMemory(0));
77 // In-memory cookie store. 76 // In-memory cookie store.
78 cookie_store_ = new net::CookieMonster(NULL, NULL); 77 cookie_store_ = new net::CookieMonster(NULL, NULL);
79 } 78 }
80 79
81 virtual ~URLRequestTestContext() { 80 virtual ~URLRequestTestContext() {
82 delete http_transaction_factory_; 81 delete http_transaction_factory_;
83 delete http_auth_handler_factory_; 82 delete http_auth_handler_factory_;
84 } 83 }
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 EXPECT_EQ(file.accessed(), 1); 191 EXPECT_EQ(file.accessed(), 1);
193 EXPECT_EQ(redir.accessed(), 1); 192 EXPECT_EQ(redir.accessed(), 1);
194 193
195 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos); 194 EXPECT_TRUE(person_task.response().find("Guthrie") != std::string::npos);
196 EXPECT_TRUE(file_task.response().find("function") != std::string::npos); 195 EXPECT_TRUE(file_task.response().find("function") != std::string::npos);
197 EXPECT_TRUE(goog_task.response().find("<title>") != std::string::npos); 196 EXPECT_TRUE(goog_task.response().find("<title>") != std::string::npos);
198 } else { 197 } else {
199 ::TerminateThread(worker, ~0); 198 ::TerminateThread(worker, ~0);
200 } 199 }
201 } 200 }
OLDNEW
« no previous file with comments | « chrome_frame/metrics_service.cc ('k') | jingle/notifier/base/chrome_async_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698