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

14 files changed, 32 insertions, 32 deletions

diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 7f82a66..7a34e65 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "net/base/directory_lister.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -132,7 +132,7 @@ TEST(DirectoryListerTest, CancelTest) {
 }
 
 TEST(DirectoryListerTest, EmptyDirTest) {
-  ScopedTempDir tempDir;
+  base::ScopedTempDir tempDir;
   EXPECT_TRUE(tempDir.CreateUniqueTempDir());
 
   bool kRecursive = false;
diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc
index 950511d..0960c30 100644
--- a/net/base/upload_data_stream_unittest.cc
+++ b/net/base/upload_data_stream_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/scoped_temp_dir.h"
 #include "base/time.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -138,7 +138,7 @@ class UploadDataStreamTest : public PlatformTest {
                          const base::Time& time,
                          bool error_expected);
 
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 
   scoped_refptr<UploadData> upload_data_;
 };
diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc
index f8a9c34..f43aad1 100644
--- a/net/base/upload_file_element_reader_unittest.cc
+++ b/net/base/upload_file_element_reader_unittest.cc
@@ -5,7 +5,7 @@
 #include "net/base/upload_file_element_reader.h"
 
 #include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
@@ -39,7 +39,7 @@ class UploadFileElementReaderTest : public PlatformTest {
 
   std::vector<char> bytes_;
   scoped_ptr<UploadElementReader> reader_;
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   FilePath temp_file_path_;
 };
 
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 6c59733..2ec657e 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -2356,7 +2356,7 @@ TEST_F(DiskCacheBackendTest, NewEvictionDoomAll2) {
 // We should be able to create the same entry on multiple simultaneous instances
 // of the cache.
 TEST_F(DiskCacheTest, MultipleInstances) {
-  ScopedTempDir store1, store2;
+  base::ScopedTempDir store1, store2;
   ASSERT_TRUE(store1.CreateUniqueTempDir());
   ASSERT_TRUE(store2.CreateUniqueTempDir());
 
diff --git a/net/disk_cache/cache_util_unittest.cc b/net/disk_cache/cache_util_unittest.cc
index 884a81c..919df7b 100644
--- a/net/disk_cache/cache_util_unittest.cc
+++ b/net/disk_cache/cache_util_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "net/disk_cache/cache_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -34,7 +34,7 @@ class CacheUtilTest : public PlatformTest {
   }
 
  protected:
-  ScopedTempDir tmp_dir_;
+  base::ScopedTempDir tmp_dir_;
   FilePath cache_dir_;
   FilePath file1_;
   FilePath file2_;
diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h
index 03a9a72..c5442a4 100644
--- a/net/disk_cache/disk_cache_test_base.h
+++ b/net/disk_cache/disk_cache_test_base.h
@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
 #include "base/threading/thread.h"
 #include "net/base/cache_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -49,7 +49,7 @@ class DiskCacheTest : public PlatformTest {
   FilePath cache_path_;
 
  private:
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   scoped_ptr<MessageLoop> message_loop_;
 };
 
diff --git a/net/disk_cache/flash/flash_cache_test_base.cc b/net/disk_cache/flash/flash_cache_test_base.cc
index ff0de12..0123e16 100644
--- a/net/disk_cache/flash/flash_cache_test_base.cc
+++ b/net/disk_cache/flash/flash_cache_test_base.cc
@@ -5,7 +5,7 @@
 #include "net/disk_cache/flash/flash_cache_test_base.h"
 
 #include "base/file_path.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/time.h"
 #include "net/disk_cache/flash/format.h"
 #include "net/disk_cache/flash/log_structured_store.h"
diff --git a/net/disk_cache/flash/flash_cache_test_base.h b/net/disk_cache/flash/flash_cache_test_base.h
index 34cbc43..cd6e54f 100644
--- a/net/disk_cache/flash/flash_cache_test_base.h
+++ b/net/disk_cache/flash/flash_cache_test_base.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -28,7 +28,7 @@ class FlashCacheTest : public testing::Test {
 
   scoped_ptr<disk_cache::LogStructuredStore> log_structured_store_;
   scoped_ptr<disk_cache::Storage> storage_;
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   int32 num_segments_in_storage_;
 
  private:
diff --git a/net/disk_cache/flash/storage_unittest.cc b/net/disk_cache/flash/storage_unittest.cc
index 2bacb11..d76b21d 100644
--- a/net/disk_cache/flash/storage_unittest.cc
+++ b/net/disk_cache/flash/storage_unittest.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/file_path.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "net/base/io_buffer.h"
 #include "net/disk_cache/disk_cache_test_util.h"
-#include "net/disk_cache/flash/storage.h"
 #include "net/disk_cache/flash/flash_cache_test_base.h"
+#include "net/disk_cache/flash/storage.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
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"));
 
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index 6beb93c..995d98e 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
-#include "base/scoped_temp_dir.h"
 #include "net/base/auth.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/upload_data.h"
@@ -577,7 +577,7 @@ class SpdyNetworkTransactionSpdy2Test
   HttpRequestInfo google_chunked_post_request_;
   HttpRequestInfo google_get_push_request_;
   SpdyTestStateHelper spdy_state_;
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 50ccbb0..5a9a40c 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
-#include "base/scoped_temp_dir.h"
 #include "net/base/auth.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/upload_data.h"
@@ -578,7 +578,7 @@ class SpdyNetworkTransactionSpdy3Test
   HttpRequestInfo google_chunked_post_request_;
   HttpRequestInfo google_get_push_request_;
   SpdyTestStateHelper spdy_state_;
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index 9a231bb..f3f0659 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -8,8 +8,8 @@
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/message_loop_proxy.h"
-#include "base/scoped_temp_dir.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
@@ -1082,7 +1082,7 @@ TEST_F(URLFetcherFileTest, SmallGet) {
                          FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Get a small file.
@@ -1104,7 +1104,7 @@ TEST_F(URLFetcherFileTest, LargeGet) {
                          FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Get a file large enough to require more than one read into
@@ -1124,7 +1124,7 @@ TEST_F(URLFetcherFileTest, CanTakeOwnershipOfFile) {
                          FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Get a small file.
@@ -1148,7 +1148,7 @@ TEST_F(URLFetcherFileTest, OverwriteExistingFile) {
                          FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Create a file before trying to fetch.
@@ -1175,7 +1175,7 @@ TEST_F(URLFetcherFileTest, TryToOverwriteDirectory) {
                          FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Create a directory before trying to fetch.