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

Unified Diff: content/browser/zygote_main_linux.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
« no previous file with comments | « content/DEPS ('k') | crypto/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/zygote_main_linux.cc
===================================================================
--- content/browser/zygote_main_linux.cc (revision 81350)
+++ content/browser/zygote_main_linux.cc (working copy)
@@ -29,13 +29,13 @@
#include "base/hash_tables.h"
#include "base/linux_util.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/pickle.h"
#include "base/process_util.h"
#include "base/rand_util.h"
#include "base/sys_info.h"
#include "build/build_config.h"
+#include "crypto/nss_util.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pepper_plugin_registry.h"
@@ -608,7 +608,7 @@
// NSS libraries are loaded before sandbox is activated. This is to allow
// successful initialization of NSS which tries to load extra library files.
// Doing so will allow NSS to be used within sandbox for chromoting.
- base::LoadNSSLibraries();
+ crypto::LoadNSSLibraries();
#else
// TODO(bulach): implement openssl support.
NOTREACHED() << "Remoting is not supported for openssl";
« no previous file with comments | « content/DEPS ('k') | crypto/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698