summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 23:34:32 +0000
committerkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 23:34:32 +0000
commitc480510971c82441db58c703e2da83fa443ed2a5 (patch)
treea39634471c00d2bef0054126e4a68a49ee5c77b9 /content
parentdbca8f17210647350127201d6c2288cac82031ef (diff)
downloadchromium_src-c480510971c82441db58c703e2da83fa443ed2a5.zip
chromium_src-c480510971c82441db58c703e2da83fa443ed2a5.tar.gz
chromium_src-c480510971c82441db58c703e2da83fa443ed2a5.tar.bz2
Add a boolean histogram "Chrome.CommandLineUseSystemSSL" to keep track of
"--use-system-ssl" usage. The flag forces the user to use SSLClientSocket[Mac, Win], instead of the default NSS SSL implementation. I also changed the order of initialize callings in BrowserMainRunnerImpl::Initialize(), because originally the StatisticsRecorder was created after main loop flag parsing so the new histogram can not be recorded. Since StatisticsRecorder has few dependencies, I think this will not have negative effect. BUG=102003 Review URL: http://codereview.chromium.org/9570052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_main_loop.cc1
-rw-r--r--content/browser/browser_main_runner.cc8
2 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index af21209..a6e6132 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -259,6 +259,7 @@ void BrowserMainLoop::EarlyInitialization() {
} else {
init_nspr = true;
}
+ UMA_HISTOGRAM_BOOLEAN("Chrome.CommandLineUseSystemSSL", !init_nspr);
#elif defined(USE_NSS)
init_nspr = true;
#endif
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 23bfb8d..05a2cb2 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -47,6 +47,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
ChildProcess::WaitForDebugger("Browser");
+ statistics_.reset(new base::StatisticsRecorder);
+
notification_service_.reset(new NotificationServiceImpl);
main_loop_.reset(new content::BrowserMainLoop(parameters));
@@ -76,8 +78,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
com_initializer_.reset(new base::win::ScopedCOMInitializer);
#endif // OS_WIN
- statistics_.reset(new base::StatisticsRecorder);
-
main_loop_->CreateThreads();
int result_code = main_loop_->GetResultCode();
if (result_code > 0)
@@ -103,8 +103,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
if (created_threads_)
main_loop_->ShutdownThreadsAndCleanUp();
- statistics_.reset(NULL);
-
#if defined(OS_WIN)
com_initializer_.reset(NULL);
#endif
@@ -113,6 +111,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
notification_service_.reset(NULL);
+ statistics_.reset(NULL);
+
is_shutdown_ = true;
}