Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5155)

Unified Diff: chrome/app/chrome_main.cc

Issue 6185005: NSS: don't set environment variables when multi-threaded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/nss_util.cc ('K') | « base/nss_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index b13944cf0bb8ed9c518a55e64b35e46ae971c94e..64530e6eb8862911b9e3145ff7d856f5c167e651 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -13,6 +13,7 @@
#include "base/message_loop.h"
#include "base/metrics/stats_counters.h"
#include "base/metrics/stats_table.h"
+#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
@@ -714,6 +715,8 @@ int ChromeMain(int argc, char** argv) {
app::RegisterPathProvider();
chrome::RegisterPathProvider();
+ base::EarlyNSSInit();
wtc 2011/01/13 00:07:02 Nit: since EarlyNSSInit doesn't use the Chrome pat
+
// Notice a user data directory override if any
const FilePath user_data_dir =
command_line.GetSwitchValuePath(switches::kUserDataDir);
« base/nss_util.cc ('K') | « base/nss_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698