Move crypto files out of base, to a top level directory.

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using net::URLRequest, meaning it is a "simple"
 // version that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because net::URLRequest only provides an asynchronous resource loading API,
@@ skipping 19 matching lines @@
 // perform URL loads.  See renderer/resource_dispatcher.h for details on an
 // alternate implementation that defers fetching to another process.
 
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #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"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
 #include "net/base/cookie_store.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ skipping 13 matching lines @@
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_dir_url_request_job.h"
 #include "webkit/fileapi/file_system_url_request_job.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
 #include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
 #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;
 using net::HttpResponseHeaders;
 using webkit_blob::DeletableFileReference;
 
 namespace {
 
 struct TestShellRequestContextParams {
   TestShellRequestContextParams(
@@ skipping 819 matching lines @@
   return getter->GetResult();
 }
 
 // static
 bool SimpleResourceLoaderBridge::EnsureIOThread() {
   if (g_io_thread)
     return true;
 
 #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,
   // so its lifetime is bonded to the IO thread lifetime.
   DCHECK(!g_cache_thread);
   g_cache_thread = new base::Thread("cache");
   CHECK(g_cache_thread->StartWithOptions(
       base::Thread::Options(MessageLoop::TYPE_IO, 0)));
 
   g_io_thread = new IOThread();
@@ skipping 21 matching lines @@
 
 // static
 scoped_refptr<base::MessageLoopProxy>
     SimpleResourceLoaderBridge::GetIoThread() {
   if (!EnsureIOThread()) {
     LOG(DFATAL) << "Failed to create IO thread.";
     return NULL;
   }
   return g_io_thread->message_loop_proxy();
 }