diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
| commit | ea1a3f60aa4527939af680eda25c7697901f643c (patch) | |
| tree | 6835e11842b4ff04ec277a5f961cbf1853b95bae /crypto | |
| parent | a628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff) | |
| download | chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.zip chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.gz chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.bz2 | |
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
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/nss_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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 <nss.h> +#include <pk11pub.h> #include <plarena.h> #include <prerror.h> #include <prinit.h> #include <prtime.h> -#include <pk11pub.h> #include <secmod.h> #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<NSPRInitSingleton>::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<ScopedTempDir> g_test_nss_db_dir = LAZY_INSTANCE_INITIALIZER; +base::LazyInstance<base::ScopedTempDir> 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) { |