OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/browser/browser_main.h" | 5 #include "content/browser/browser_main.h" |
6 | 6 |
7 #include "base/allocator/allocator_shim.h" | 7 #include "base/allocator/allocator_shim.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 if (false) { | 185 if (false) { |
186 #endif | 186 #endif |
187 // We want to be sure to init NSPR on the main thread. | 187 // We want to be sure to init NSPR on the main thread. |
188 crypto::EnsureNSPRInit(); | 188 crypto::EnsureNSPRInit(); |
189 } | 189 } |
190 | 190 |
191 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 191 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
192 SetupSandbox(parsed_command_line()); | 192 SetupSandbox(parsed_command_line()); |
193 #endif | 193 #endif |
194 | 194 |
195 if (parsed_command_line().HasSwitch(switches::kEnableBenchmarking)) | |
196 base::FieldTrial::EnableBenchmarking(); | |
197 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) | 195 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) |
198 net::SSLConfigService::DisableFalseStart(); | 196 net::SSLConfigService::DisableFalseStart(); |
199 if (parsed_command_line().HasSwitch(switches::kEnableSSLCachedInfo)) | 197 if (parsed_command_line().HasSwitch(switches::kEnableSSLCachedInfo)) |
200 net::SSLConfigService::EnableCachedInfo(); | 198 net::SSLConfigService::EnableCachedInfo(); |
201 if (parsed_command_line().HasSwitch(switches::kEnableOriginBoundCerts)) | 199 if (parsed_command_line().HasSwitch(switches::kEnableOriginBoundCerts)) |
202 net::SSLConfigService::EnableOriginBoundCerts(); | 200 net::SSLConfigService::EnableOriginBoundCerts(); |
203 if (parsed_command_line().HasSwitch( | 201 if (parsed_command_line().HasSwitch( |
204 switches::kEnableDNSCertProvenanceChecking)) { | 202 switches::kEnableDNSCertProvenanceChecking)) { |
205 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 203 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
206 } | 204 } |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 #endif // OS_WIN | 398 #endif // OS_WIN |
401 | 399 |
402 // Initialize histogram statistics gathering system. | 400 // Initialize histogram statistics gathering system. |
403 base::StatisticsRecorder statistics; | 401 base::StatisticsRecorder statistics; |
404 | 402 |
405 parts->RunMainMessageLoopParts(); | 403 parts->RunMainMessageLoopParts(); |
406 | 404 |
407 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 405 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
408 return parts->result_code(); | 406 return parts->result_code(); |
409 } | 407 } |
OLD | NEW |