diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 23:34:17 +0000 |
| commit | e078590661444968a2c49a3e5464413714471dca (patch) | |
| tree | 13a4dbe4dedccc8057361bd86c89e065390247fc /base/file_util_unittest.cc | |
| parent | d9f76627b14170b95639619089139b6f0493ae8c (diff) | |
| download | chromium_src-e078590661444968a2c49a3e5464413714471dca.zip chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.gz chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.bz2 | |
Move scoped_temp_dir and scoped_native_library back from base/memory to base.
It looks like they got moved accidentally in http://codereview.chromium.org/6714032
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7048007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_unittest.cc')
| -rw-r--r-- | base/file_util_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 733f9f1..fe3927d 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -6,10 +6,10 @@ #if defined(OS_WIN) #include <windows.h> -#include <winioctl.h> #include <shellapi.h> #include <shlobj.h> #include <tchar.h> +#include <winioctl.h> #endif #include <fstream> @@ -18,8 +18,8 @@ #include "base/base_paths.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/scoped_temp_dir.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" |