OLD | NEW |
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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 delete http_auth_handler_factory_; | 142 delete http_auth_handler_factory_; |
143 } | 143 } |
144 | 144 |
145 void Initialize() { | 145 void Initialize() { |
146 user_agent_ = http_utils::GetDefaultUserAgent(); | 146 user_agent_ = http_utils::GetDefaultUserAgent(); |
147 user_agent_ = http_utils::AddChromeFrameToUserAgentValue( | 147 user_agent_ = http_utils::AddChromeFrameToUserAgentValue( |
148 user_agent_); | 148 user_agent_); |
149 | 149 |
150 host_resolver_ = | 150 host_resolver_ = |
151 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, | 151 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, |
152 NULL); | 152 NULL, NULL); |
153 net::ProxyConfigService* proxy_config_service = | 153 net::ProxyConfigService* proxy_config_service = |
154 net::ProxyService::CreateSystemProxyConfigService(NULL, NULL); | 154 net::ProxyService::CreateSystemProxyConfigService(NULL, NULL); |
155 DCHECK(proxy_config_service); | 155 DCHECK(proxy_config_service); |
156 | 156 |
157 proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( | 157 proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver( |
158 proxy_config_service, 0, NULL); | 158 proxy_config_service, 0, NULL); |
159 DCHECK(proxy_service_); | 159 DCHECK(proxy_service_); |
160 | 160 |
161 ssl_config_service_ = new net::SSLConfigServiceDefaults; | 161 ssl_config_service_ = new net::SSLConfigServiceDefaults; |
162 | 162 |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 version += "-F"; | 594 version += "-F"; |
595 if (!version_info.IsOfficialBuild()) | 595 if (!version_info.IsOfficialBuild()) |
596 version.append("-devel"); | 596 version.append("-devel"); |
597 return version; | 597 return version; |
598 } else { | 598 } else { |
599 NOTREACHED() << "Unable to retrieve version string."; | 599 NOTREACHED() << "Unable to retrieve version string."; |
600 } | 600 } |
601 | 601 |
602 return std::string(); | 602 return std::string(); |
603 } | 603 } |
OLD | NEW |