| 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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 // Use NSS for SSL by default. | 256 // Use NSS for SSL by default. |
| 257 // The default client socket factory uses NSS for SSL by default on | 257 // The default client socket factory uses NSS for SSL by default on |
| 258 // Windows and Mac. | 258 // Windows and Mac. |
| 259 bool init_nspr = false; | 259 bool init_nspr = false; |
| 260 #if defined(OS_WIN) || defined(OS_MACOSX) | 260 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 261 if (parsed_command_line_.HasSwitch(switches::kUseSystemSSL)) { | 261 if (parsed_command_line_.HasSwitch(switches::kUseSystemSSL)) { |
| 262 net::ClientSocketFactory::UseSystemSSL(); | 262 net::ClientSocketFactory::UseSystemSSL(); |
| 263 } else { | 263 } else { |
| 264 init_nspr = true; | 264 init_nspr = true; |
| 265 } | 265 } |
| 266 UMA_HISTOGRAM_BOOLEAN("Chrome.CommandLineUseSystemSSL", !init_nspr); |
| 266 #elif defined(USE_NSS) | 267 #elif defined(USE_NSS) |
| 267 init_nspr = true; | 268 init_nspr = true; |
| 268 #endif | 269 #endif |
| 269 if (init_nspr) { | 270 if (init_nspr) { |
| 270 // We want to be sure to init NSPR on the main thread. | 271 // We want to be sure to init NSPR on the main thread. |
| 271 crypto::EnsureNSPRInit(); | 272 crypto::EnsureNSPRInit(); |
| 272 } | 273 } |
| 273 #endif // !defined(USE_OPENSSL) | 274 #endif // !defined(USE_OPENSSL) |
| 274 | 275 |
| 275 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 276 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); | 635 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); |
| 635 | 636 |
| 636 #if defined(OS_MACOSX) | 637 #if defined(OS_MACOSX) |
| 637 MessageLoopForUI::current()->Run(); | 638 MessageLoopForUI::current()->Run(); |
| 638 #else | 639 #else |
| 639 MessageLoopForUI::current()->RunWithDispatcher(NULL); | 640 MessageLoopForUI::current()->RunWithDispatcher(NULL); |
| 640 #endif | 641 #endif |
| 641 } | 642 } |
| 642 | 643 |
| 643 } // namespace content | 644 } // namespace content |
| OLD | NEW |