From 4b559b4ddffc0b7f688019bcb80658f05e063af7 Mon Sep 17 00:00:00 2001 From: "rvargas@google.com" Date: Thu, 14 Apr 2011 17:37:14 +0000 Subject: 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 --- webkit/tools/test_shell/simple_resource_loader_bridge.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index 7f278bd..ea2a78b 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -37,9 +37,6 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#if defined(OS_MACOSX) || defined(OS_WIN) -#include "base/nss_util.h" -#endif #include "base/memory/ref_counted.h" #include "base/time.h" #include "base/timer.h" @@ -73,6 +70,10 @@ #include "webkit/tools/test_shell/test_shell_request_context.h" #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h" +#if defined(OS_MACOSX) || defined(OS_WIN) +#include "crypto/nss_util.h" +#endif + using webkit_glue::ResourceLoaderBridge; using webkit_glue::ResourceResponseInfo; using net::StaticCookiePolicy; @@ -912,7 +913,7 @@ bool SimpleResourceLoaderBridge::EnsureIOThread() { #if defined(OS_MACOSX) || defined(OS_WIN) // We want to be sure to init NSPR on the main thread. - base::EnsureNSPRInit(); + crypto::EnsureNSPRInit(); #endif // Create the cache thread. We want the cache thread to outlive the IO thread, -- cgit v1.1