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

Side by Side Diff: chrome_frame/metrics_service.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/test/plugin/plugin_test.cpp ('k') | chrome_frame/test/test_server_test.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 5
6 //------------------------------------------------------------------------------ 6 //------------------------------------------------------------------------------
7 // Description of the life cycle of a instance of MetricsService. 7 // Description of the life cycle of a instance of MetricsService.
8 // 8 //
9 // OVERVIEW 9 // OVERVIEW
10 // 10 //
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 std::vector<std::string> supported_schemes; 170 std::vector<std::string> supported_schemes;
171 base::SplitString(csv_auth_schemes, ',', &supported_schemes); 171 base::SplitString(csv_auth_schemes, ',', &supported_schemes);
172 172
173 http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( 173 http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create(
174 supported_schemes, url_security_manager_.get(), host_resolver_, false, 174 supported_schemes, url_security_manager_.get(), host_resolver_, false,
175 false); 175 false);
176 176
177 http_transaction_factory_ = new net::HttpCache( 177 http_transaction_factory_ = new net::HttpCache(
178 net::HttpNetworkLayer::CreateFactory(host_resolver_, 178 net::HttpNetworkLayer::CreateFactory(host_resolver_,
179 NULL /* dnsrr_resovler */, 179 NULL /* dnsrr_resovler */,
180 NULL /* ssl_host_info */,
181 proxy_service_, 180 proxy_service_,
182 ssl_config_service_, 181 ssl_config_service_,
183 http_auth_handler_factory_, 182 http_auth_handler_factory_,
184 network_delegate_, 183 network_delegate_,
185 NULL), 184 NULL),
186 net::HttpCache::DefaultBackend::InMemory(0)); 185 net::HttpCache::DefaultBackend::InMemory(0));
187 } 186 }
188 187
189 virtual const std::string& GetUserAgent(const GURL& url) const { 188 virtual const std::string& GetUserAgent(const GURL& url) const {
190 return user_agent_; 189 return user_agent_;
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 version += "-F"; 599 version += "-F";
601 if (!version_info.IsOfficialBuild()) 600 if (!version_info.IsOfficialBuild())
602 version.append("-devel"); 601 version.append("-devel");
603 return version; 602 return version;
604 } else { 603 } else {
605 NOTREACHED() << "Unable to retrieve version string."; 604 NOTREACHED() << "Unable to retrieve version string.";
606 } 605 }
607 606
608 return std::string(); 607 return std::string();
609 } 608 }
OLDNEW
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | chrome_frame/test/test_server_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698