diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 17:37:14 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 17:37:14 +0000 |
| commit | 4b559b4ddffc0b7f688019bcb80658f05e063af7 (patch) | |
| tree | 0be21d8914de707f5125d2cb66733cbcf088606c /content/browser/zygote_main_linux.cc | |
| parent | 056dd45d610de34312344445d7b078a31f4a1e20 (diff) | |
| download | chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.zip chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.gz chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.bz2 | |
Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our
cryptographic primitives (except md5 and sha1).
This removes the base dependency from nss, openssl and sqlite.
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6805019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_main_linux.cc')
| -rw-r--r-- | content/browser/zygote_main_linux.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index 5669530..a0d0ef0 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -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 @@ static void PreSandboxInit() { // 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"; |