Move directory creation functions to base namespace.

BUG=

Review URL: https://codereview.chromium.org/100573002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238446 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 29 insertions, 29 deletions

diff --git a/chrome/common/auto_start_linux.cc b/chrome/common/auto_start_linux.cc
index 9051149..c9c3fcc 100644
--- a/chrome/common/auto_start_linux.cc
+++ b/chrome/common/auto_start_linux.cc
@@ -33,7 +33,7 @@ bool AutoStart::AddApplication(const std::string& autostart_filename,
   scoped_ptr<base::Environment> environment(base::Environment::Create());
   base::FilePath autostart_directory = GetAutostartDirectory(environment.get());
   if (!base::DirectoryExists(autostart_directory) &&
-      !file_util::CreateDirectory(autostart_directory)) {
+      !base::CreateDirectory(autostart_directory)) {
     return false;
   }
 
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index b37dadb..6e55ab9 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -518,7 +518,7 @@ bool PathProvider(int key, base::FilePath* result) {
   // TODO(bauerb): http://crbug.com/259796
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (create_dir && !base::PathExists(cur) &&
-      !file_util::CreateDirectory(cur))
+      !base::CreateDirectory(cur))
     return false;
 
   *result = cur;
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 1e41ea4..82982b0 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -71,7 +71,7 @@ base::FilePath InstallExtension(const base::FilePath& unpacked_source_dir,
 
   // Create the extension directory if it doesn't exist already.
   if (!base::PathExists(extension_dir)) {
-    if (!file_util::CreateDirectory(extension_dir))
+    if (!base::CreateDirectory(extension_dir))
       return base::FilePath();
   }
 
@@ -517,7 +517,7 @@ base::FilePath GetInstallTempDir(const base::FilePath& extensions_dir) {
   }
 
   // Directory doesn't exist, so create it.
-  if (!file_util::CreateDirectory(temp_path)) {
+  if (!base::CreateDirectory(temp_path)) {
     DLOG(WARNING) << "Couldn't create directory: " << temp_path.value();
     return base::FilePath();
   }
diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index f767f24..71db8c9 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -36,11 +36,11 @@ TEST_F(ExtensionFileUtilTest, InstallUninstallGarbageCollect) {
   std::string extension_id("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   std::string version("1.0");
   base::FilePath src = temp.path().AppendASCII(extension_id);
-  ASSERT_TRUE(file_util::CreateDirectory(src));
+  ASSERT_TRUE(base::CreateDirectory(src));
 
   // Create a extensions tree.
   base::FilePath all_extensions = temp.path().AppendASCII("extensions");
-  ASSERT_TRUE(file_util::CreateDirectory(all_extensions));
+  ASSERT_TRUE(base::CreateDirectory(all_extensions));
 
   // Install in empty directory. Should create parent directories as needed.
   base::FilePath version_1 = extension_file_util::InstallExtension(
@@ -57,7 +57,7 @@ TEST_F(ExtensionFileUtilTest, InstallUninstallGarbageCollect) {
   ASSERT_FALSE(base::DirectoryExists(src));
 
   // Install again. Should create a new one with different name.
-  ASSERT_TRUE(file_util::CreateDirectory(src));
+  ASSERT_TRUE(base::CreateDirectory(src));
   base::FilePath version_2 = extension_file_util::InstallExtension(
       src,
       extension_id,
@@ -72,7 +72,7 @@ TEST_F(ExtensionFileUtilTest, InstallUninstallGarbageCollect) {
   ASSERT_FALSE(base::DirectoryExists(src));
 
   // Install yet again. Should create a new one with a different name.
-  ASSERT_TRUE(file_util::CreateDirectory(src));
+  ASSERT_TRUE(base::CreateDirectory(src));
   base::FilePath version_3 = extension_file_util::InstallExtension(
       src,
       extension_id,
@@ -139,7 +139,7 @@ TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesNoUnderscores) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().AppendASCII("some_dir");
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   std::string data = "{ \"name\": { \"message\": \"foobar\" } }";
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("some_file.txt"),
@@ -158,7 +158,7 @@ TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesOnlyReserved) {
 
   for (size_t i = 0; i < arraysize(folders); i++) {
     base::FilePath src_path = temp.path().Append(folders[i]);
-    ASSERT_TRUE(file_util::CreateDirectory(src_path));
+    ASSERT_TRUE(base::CreateDirectory(src_path));
   }
 
   std::string error;
@@ -171,10 +171,10 @@ TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesReservedAndIllegal) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(extensions::kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   src_path = temp.path().AppendASCII("_some_dir");
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   std::string error;
   EXPECT_FALSE(extension_file_util::CheckForIllegalFilenames(temp.path(),
@@ -357,7 +357,7 @@ TEST_F(ExtensionFileUtilTest, FindPrivateKeyFiles) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().AppendASCII("some_dir");
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("a_key.pem"),
                                    private_key, arraysize(private_key)));
@@ -383,7 +383,7 @@ TEST_F(ExtensionFileUtilTest, WarnOnPrivateKey) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath ext_path = temp.path().AppendASCII("ext_root");
-  ASSERT_TRUE(file_util::CreateDirectory(ext_path));
+  ASSERT_TRUE(base::CreateDirectory(ext_path));
 
   const char manifest[] =
       "{\n"
diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc
index 8ba14de..9004b10 100644
--- a/chrome/common/extensions/extension_l10n_util_unittest.cc
+++ b/chrome/common/extensions/extension_l10n_util_unittest.cc
@@ -35,7 +35,7 @@ TEST(ExtensionL10nUtil, ValidateLocalesWithBadLocale) {
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
   base::FilePath locale = src_path.AppendASCII("ms");
-  ASSERT_TRUE(file_util::CreateDirectory(locale));
+  ASSERT_TRUE(base::CreateDirectory(locale));
 
   base::FilePath messages_file = locale.Append(kMessagesFilename);
   std::string data = "{ \"name\":";
@@ -56,7 +56,7 @@ TEST(ExtensionL10nUtil, GetValidLocalesEmptyLocaleFolder) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   std::string error;
   std::set<std::string> locales;
@@ -72,8 +72,8 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithValidLocaleNoMessagesFile) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
-  ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("sr")));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path.AppendASCII("sr")));
 
   std::string error;
   std::set<std::string> locales;
@@ -89,16 +89,16 @@ TEST(ExtensionL10nUtil, GetValidLocalesWithUnsupportedLocale) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
   // Supported locale.
   base::FilePath locale_1 = src_path.AppendASCII("sr");
-  ASSERT_TRUE(file_util::CreateDirectory(locale_1));
+  ASSERT_TRUE(base::CreateDirectory(locale_1));
   std::string data("whatever");
   ASSERT_TRUE(file_util::WriteFile(
       locale_1.Append(kMessagesFilename),
       data.c_str(), data.length()));
   // Unsupported locale.
-  ASSERT_TRUE(file_util::CreateDirectory(src_path.AppendASCII("xxx_yyy")));
+  ASSERT_TRUE(base::CreateDirectory(src_path.AppendASCII("xxx_yyy")));
 
   std::string error;
   std::set<std::string> locales;
@@ -161,7 +161,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   std::set<std::string> valid_locales;
   valid_locales.insert("sr");
@@ -180,10 +180,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   base::FilePath locale = src_path.AppendASCII("sr");
-  ASSERT_TRUE(file_util::CreateDirectory(locale));
+  ASSERT_TRUE(base::CreateDirectory(locale));
 
   std::string data = "{ \"name\":";
   base::FilePath messages_file = locale.Append(kMessagesFilename);
@@ -211,10 +211,10 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   base::FilePath src_path = temp.path().Append(kLocaleFolder);
-  ASSERT_TRUE(file_util::CreateDirectory(src_path));
+  ASSERT_TRUE(base::CreateDirectory(src_path));
 
   base::FilePath locale_1 = src_path.AppendASCII("en");
-  ASSERT_TRUE(file_util::CreateDirectory(locale_1));
+  ASSERT_TRUE(base::CreateDirectory(locale_1));
 
   std::string data =
     "{ \"name\": { \"message\": \"something\" }, "
@@ -224,7 +224,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
                            data.c_str(), data.length()));
 
   base::FilePath locale_2 = src_path.AppendASCII("sr");
-  ASSERT_TRUE(file_util::CreateDirectory(locale_2));
+  ASSERT_TRUE(base::CreateDirectory(locale_2));
 
   ASSERT_TRUE(
       file_util::WriteFile(locale_2.Append(kMessagesFilename),
diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc
index 361629f..63975fe 100644
--- a/chrome/common/mac/mock_launchd.cc
+++ b/chrome/common/mac/mock_launchd.cc
@@ -37,7 +37,7 @@ bool MockLaunchd::MakeABundle(const base::FilePath& dst,
   *executable = mac_os.Append(name);
   base::FilePath info_plist = contents.Append("Info.plist");
 
-  if (!file_util::CreateDirectory(mac_os)) {
+  if (!base::CreateDirectory(mac_os)) {
     return false;
   }
   const char *data = "#! testbundle\n";
diff --git a/chrome/common/net/url_fixer_upper_unittest.cc b/chrome/common/net/url_fixer_upper_unittest.cc
index 6efb6bc..ea80c73 100644
--- a/chrome/common/net/url_fixer_upper_unittest.cc
+++ b/chrome/common/net/url_fixer_upper_unittest.cc
@@ -501,7 +501,7 @@ TEST(URLFixerUpperTest, FixupRelativeFile) {
   base::FilePath sub_file(
       FILE_PATH_LITERAL("url fixer-upper existing file.txt"));
   base::FilePath new_dir = dir.Append(sub_dir);
-  file_util::CreateDirectory(new_dir);
+  base::CreateDirectory(new_dir);
   ASSERT_TRUE(MakeTempFile(new_dir, sub_file, &full_path));
   full_path = base::MakeAbsoluteFilePath(full_path);
   ASSERT_FALSE(full_path.empty());