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 /net/http | |
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 'net/http')
-rw-r--r-- | net/http/http_stream_parser_unittest.cc | 4 | ||||
-rw-r--r-- | net/http/infinite_cache_unittest.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index bfe2d46..b609c47 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -6,8 +6,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "base/stringprintf.h" #include "googleurl/src/gurl.h" @@ -120,7 +120,7 @@ TEST(HttpStreamParser, ShouldMergeRequestHeadersAndBody_FileBody) { scoped_refptr<UploadData> upload_data = new UploadData; // Create an empty temporary file. - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath temp_file_path; ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir.path(), diff --git a/net/http/infinite_cache_unittest.cc b/net/http/infinite_cache_unittest.cc index 707f248..813adbc 100644 --- a/net/http/infinite_cache_unittest.cc +++ b/net/http/infinite_cache_unittest.cc @@ -5,7 +5,7 @@ #include "net/http/infinite_cache.h" #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "net/base/net_errors.h" @@ -113,7 +113,7 @@ TEST(InfiniteCache, Basics) { } TEST(InfiniteCache, Save_Restore) { - ScopedTempDir dir; + base::ScopedTempDir dir; ASSERT_TRUE(dir.CreateUniqueTempDir()); FilePath path = dir.path().Append(FILE_PATH_LITERAL("infinite")); @@ -165,7 +165,7 @@ TEST(InfiniteCache, DoomMethod) { } TEST(InfiniteCache, Delete) { - ScopedTempDir dir; + base::ScopedTempDir dir; ASSERT_TRUE(dir.CreateUniqueTempDir()); FilePath path = dir.path().Append(FILE_PATH_LITERAL("infinite")); @@ -191,7 +191,7 @@ TEST(InfiniteCache, Delete) { TEST(InfiniteCache, DeleteBetween) { #if !defined(OS_ANDROID) - ScopedTempDir dir; + base::ScopedTempDir dir; ASSERT_TRUE(dir.CreateUniqueTempDir()); FilePath path = dir.path().Append(FILE_PATH_LITERAL("infinite")); |