| Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/simple_resource_loader_bridge.cc (revision 81350)
|
| +++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy)
|
| @@ -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 @@
|
|
|
| #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,
|
|
|