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

12 files changed, 42 insertions, 42 deletions

diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 7d857b5..d6dea3f 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -9,11 +9,11 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
@@ -83,7 +83,7 @@ FilePath InstallExtension(const FilePath& unpacked_source_dir,
 
   // Get a temp directory on the same file system as the profile.
   FilePath install_temp_dir = GetInstallTempDir(extensions_dir);
-  ScopedTempDir extension_temp_dir;
+  base::ScopedTempDir extension_temp_dir;
   if (install_temp_dir.empty() ||
       !extension_temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) {
     LOG(ERROR) << "Creating of temp dir under in the profile failed.";
diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index 4e7f9ab..d445fce 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -5,9 +5,9 @@
 #include "chrome/common/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
@@ -27,7 +27,7 @@ namespace keys = extension_manifest_keys;
 #define InstallUninstallGarbageCollect DISABLED_InstallUninstallGarbageCollect
 #endif
 TEST(ExtensionFileUtil, InstallUninstallGarbageCollect) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   // Create a source extension.
@@ -135,7 +135,7 @@ TEST(ExtensionFileUtil, LoadExtensionWithoutLocalesFolder) {
     DISABLED_CheckIllegalFilenamesNoUnderscores
 #endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesNoUnderscores) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().AppendASCII("some_dir");
@@ -155,7 +155,7 @@ TEST(ExtensionFileUtil, CheckIllegalFilenamesNoUnderscores) {
     DISABLED_CheckIllegalFilenamesOnlyReserved
 #endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesOnlyReserved) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -172,7 +172,7 @@ TEST(ExtensionFileUtil, CheckIllegalFilenamesOnlyReserved) {
     DISABLED_CheckIllegalFilenamesReservedAndIllegal
 #endif
 TEST(ExtensionFileUtil, CheckIllegalFilenamesReservedAndIllegal) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -382,7 +382,7 @@ static scoped_refptr<Extension> LoadExtensionManifest(
 #define ValidateThemeUTF8 DISABLED_ValidateThemeUTF8
 #endif
 TEST(ExtensionFileUtil, ValidateThemeUTF8) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   // "aeo" with accents. Use http://0xcc.net/jsescape/ to decode them.
@@ -415,7 +415,7 @@ TEST(ExtensionFileUtil, ValidateThemeUTF8) {
 #define MAYBE_BackgroundScriptsMustExist BackgroundScriptsMustExist
 #endif
 TEST(ExtensionFileUtil, MAYBE_BackgroundScriptsMustExist) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   scoped_ptr<DictionaryValue> value(new DictionaryValue());
@@ -478,7 +478,7 @@ const char private_key[] =
     "-----END PRIVATE KEY-----\n";
 
 TEST(ExtensionFileUtil, FindPrivateKeyFiles) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().AppendASCII("some_dir");
@@ -504,7 +504,7 @@ TEST(ExtensionFileUtil, FindPrivateKeyFiles) {
 }
 
 TEST(ExtensionFileUtil, WarnOnPrivateKey) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath ext_path = temp.path().AppendASCII("ext_root");
diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc
index bee0478..3212029 100644
--- a/chrome/common/extensions/extension_l10n_util_unittest.cc
+++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
@@ -4,15 +4,15 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -70,7 +70,7 @@ namespace {
 #endif
 
 TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -86,7 +86,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
 }
 
 TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -103,7 +103,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) {
 }
 
 TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -175,7 +175,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) {
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -194,7 +194,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
@@ -221,7 +221,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
 }
 
 TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath src_path = temp.path().Append(Extension::kLocaleFolder);
diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc
index 67c9ebd..acb6ad5 100644
--- a/chrome/common/extensions/extension_resource_unittest.cc
+++ b/chrome/common/extensions/extension_resource_unittest.cc
@@ -5,8 +5,8 @@
 #include <algorithm>
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
@@ -44,7 +44,7 @@ TEST(ExtensionResourceTest, CreateWithMissingResourceOnDisk) {
 }
 
 TEST(ExtensionResourceTest, ResourcesOutsideOfPath) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   FilePath inner_dir = temp.path().AppendASCII("directory");
@@ -106,7 +106,7 @@ TEST(ExtensionResourceTest, ResourcesOutsideOfPath) {
 #define CreateWithAllResourcesOnDisk DISABLED_CreateWithAllResourcesOnDisk
 #endif
 TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) {
-  ScopedTempDir temp;
+  base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   // Create resource in the extension root.
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
index 2681513..135de36 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
@@ -5,8 +5,8 @@
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 
 #include "base/command_line.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
-#include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -106,7 +106,7 @@ TEST_F(ExtensionManifestTest, CertainApisRequirePlatformApps) {
   scoped_ptr<DictionaryValue> manifest(
       LoadManifestFile("init_valid_platform_app.json", &error));
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   // Create each manifest.
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc
index 001baa5..08eb09b 100644
--- a/chrome/common/extensions/unpacker.cc
+++ b/chrome/common/extensions/unpacker.cc
@@ -7,18 +7,18 @@
 #include <set>
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
-#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
 #include "content/public/common/common_param_traits.h"
diff --git a/chrome/common/extensions/unpacker_unittest.cc b/chrome/common/extensions/unpacker_unittest.cc
index 5f69ebb..bbb8b55 100644
--- a/chrome/common/extensions/unpacker_unittest.cc
+++ b/chrome/common/extensions/unpacker_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -53,7 +53,7 @@ public:
   }
 
  protected:
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   scoped_ptr<Unpacker> unpacker_;
 };
 
diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc
index 11982ec..69685f2 100644
--- a/chrome/common/json_value_serializer_unittest.cc
+++ b/chrome/common/json_value_serializer_unittest.cc
@@ -4,12 +4,12 @@
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -244,7 +244,7 @@ protected:
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 };
 
 TEST_F(JSONFileValueSerializerTest, Roundtrip) {
diff --git a/chrome/common/mac/app_mode_chrome_locator_unittest.mm b/chrome/common/mac/app_mode_chrome_locator_unittest.mm
index b54fee75..2713ddc 100644
--- a/chrome/common/mac/app_mode_chrome_locator_unittest.mm
+++ b/chrome/common/mac/app_mode_chrome_locator_unittest.mm
@@ -8,8 +8,8 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "chrome/common/chrome_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -40,7 +40,7 @@ TEST(ChromeLocatorTest, FindNonExistentBundle) {
 }
 
 TEST(ChromeLocatorTest, GetNonExistentBundleInfo) {
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   string16 raw_version;
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index f68064a..a875c0d 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -27,8 +27,8 @@
 #endif
 
 #if defined(OS_POSIX)
-#include "chrome/common/auto_start_linux.h"
 #include <glib.h>
+#include "chrome/common/auto_start_linux.h"
 #endif
 
 #if defined(USE_AURA)
@@ -241,8 +241,8 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/mac/mac_util.h"
-#include "base/scoped_temp_dir.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "chrome/common/mac/launchd.h"
@@ -289,7 +289,7 @@ class ServiceProcessStateFileManipulationTest : public ::testing::Test {
   void Run() { loop_.Run(); }
 
  private:
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
   MessageLoopForUI loop_;
   base::Thread io_thread_;
   FilePath executable_path_, bundle_path_;
diff --git a/chrome/common/zip_reader_unittest.cc b/chrome/common/zip_reader_unittest.cc
index ea65ae3..5afe4af 100644
--- a/chrome/common/zip_reader_unittest.cc
+++ b/chrome/common/zip_reader_unittest.cc
@@ -14,9 +14,9 @@
 #include <string>
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/md5.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
@@ -112,7 +112,7 @@ class ZipReaderTest : public PlatformTest {
   FilePath evil_via_absolute_file_name_zip_file_;
   std::set<FilePath> test_zip_contents_;
 
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 };
 
 TEST_F(ZipReaderTest, Open_ValidZipFile) {
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index d2cff71..4d3d5d8 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -6,8 +6,8 @@
 #include <vector>
 
 #include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/zip.h"
@@ -87,7 +87,7 @@ class ZipTest : public PlatformTest {
   // The path to temporary directory used to contain the test operations.
   FilePath test_dir_;
 
-  ScopedTempDir temp_dir_;
+  base::ScopedTempDir temp_dir_;
 
   // Hard-coded contents of a known zip file.
   std::set<FilePath> zip_contents_;
@@ -139,7 +139,7 @@ TEST_F(ZipTest, Zip) {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
   src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
 
@@ -152,7 +152,7 @@ TEST_F(ZipTest, ZipIgnoreHidden) {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
   src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
 
@@ -165,7 +165,7 @@ TEST_F(ZipTest, ZipFiles) {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
   src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
 
-  ScopedTempDir temp_dir;
+  base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   FilePath zip_file = temp_dir.path().AppendASCII("out.zip");