From ea1a3f60aa4527939af680eda25c7697901f643c Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 16 Nov 2012 20:34:23 +0000 Subject: Move scoped_temp_dir from base to base/files Also add to base namespace. BUG= Review URL: https://codereview.chromium.org/11359217 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168281 0039d316-1c4b-4281-b951-d872f2087c98 --- crypto/nss_util.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crypto') diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 26626e7..dac0e22 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -6,11 +6,11 @@ #include "crypto/nss_util_internal.h" #include +#include #include #include #include #include -#include #include #if defined(OS_LINUX) @@ -27,11 +27,11 @@ #include "base/environment.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/native_library.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" @@ -223,7 +223,8 @@ base::LazyInstance::Leaky // This is a LazyInstance so that it will be deleted automatically when the // unittest exits. NSSInitSingleton is a LeakySingleton, so it would not be // deleted if it were a regular member. -base::LazyInstance g_test_nss_db_dir = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance g_test_nss_db_dir = + LAZY_INSTANCE_INITIALIZER; // Force a crash to debug http://crbug.com/153281. void CrashWithErrors(int nss_error, int os_error) { -- cgit v1.1