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

Unified Diff: chrome/renderer/render_process_impl.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 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
Index: chrome/renderer/render_process_impl.cc
===================================================================
--- chrome/renderer/render_process_impl.cc (revision 81350)
+++ chrome/renderer/render_process_impl.cc (working copy)
@@ -18,10 +18,10 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
+#include "crypto/nss_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/render_messages.h"
@@ -167,9 +167,9 @@
#if defined(USE_NSS)
// We are going to fork to engage the sandbox and we have not loaded
// any security modules so it is safe to disable the fork check in NSS.
- base::DisableNSSForkCheck();
- base::ForceNSSNoDBInit();
- base::EnsureNSSInit();
+ crypto::DisableNSSForkCheck();
+ crypto::ForceNSSNoDBInit();
+ crypto::EnsureNSSInit();
#else
// TODO(bulach): implement openssl support.
NOTREACHED() << "Remoting is not supported for openssl";
« no previous file with comments | « chrome/common/net/x509_certificate_model_nss.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698