Commit c4805109 authored by kaiwang@chromium.org's avatar kaiwang@chromium.org

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
parent dbca8f17
...@@ -259,6 +259,7 @@ void BrowserMainLoop::EarlyInitialization() { ...@@ -259,6 +259,7 @@ void BrowserMainLoop::EarlyInitialization() {
} else { } else {
init_nspr = true; init_nspr = true;
} }
UMA_HISTOGRAM_BOOLEAN("Chrome.CommandLineUseSystemSSL", !init_nspr);
#elif defined(USE_NSS) #elif defined(USE_NSS)
init_nspr = true; init_nspr = true;
#endif #endif
......
...@@ -47,6 +47,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner { ...@@ -47,6 +47,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
ChildProcess::WaitForDebugger("Browser"); ChildProcess::WaitForDebugger("Browser");
statistics_.reset(new base::StatisticsRecorder);
notification_service_.reset(new NotificationServiceImpl); notification_service_.reset(new NotificationServiceImpl);
main_loop_.reset(new content::BrowserMainLoop(parameters)); main_loop_.reset(new content::BrowserMainLoop(parameters));
...@@ -76,8 +78,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner { ...@@ -76,8 +78,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
com_initializer_.reset(new base::win::ScopedCOMInitializer); com_initializer_.reset(new base::win::ScopedCOMInitializer);
#endif // OS_WIN #endif // OS_WIN
statistics_.reset(new base::StatisticsRecorder);
main_loop_->CreateThreads(); main_loop_->CreateThreads();
int result_code = main_loop_->GetResultCode(); int result_code = main_loop_->GetResultCode();
if (result_code > 0) if (result_code > 0)
...@@ -103,8 +103,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner { ...@@ -103,8 +103,6 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
if (created_threads_) if (created_threads_)
main_loop_->ShutdownThreadsAndCleanUp(); main_loop_->ShutdownThreadsAndCleanUp();
statistics_.reset(NULL);
#if defined(OS_WIN) #if defined(OS_WIN)
com_initializer_.reset(NULL); com_initializer_.reset(NULL);
#endif #endif
...@@ -113,6 +111,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner { ...@@ -113,6 +111,8 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
notification_service_.reset(NULL); notification_service_.reset(NULL);
statistics_.reset(NULL);
is_shutdown_ = true; is_shutdown_ = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment