Move directory creation functions to base namespace.

chrome/common/extensions/extension_file_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
@@ skipping 18 matching lines @@
 };
 
 TEST_F(ExtensionFileUtilTest, InstallUninstallGarbageCollect) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   // Create a source extension.
   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(
       src,
       extension_id,
       version,
       all_extensions);
   ASSERT_EQ(version_1.value(),
             all_extensions.AppendASCII(extension_id).AppendASCII("1.0_0")
                 .value());
   ASSERT_TRUE(base::DirectoryExists(version_1));
 
   // Should have moved the source.
   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,
       version,
       all_extensions);
   ASSERT_EQ(version_2.value(),
             all_extensions.AppendASCII(extension_id).AppendASCII("1.0_1")
                 .value());
   ASSERT_TRUE(base::DirectoryExists(version_2));
 
   // Should have moved the source.
   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,
       version,
       all_extensions);
   ASSERT_EQ(version_3.value(),
             all_extensions.AppendASCII(extension_id).AppendASCII("1.0_2")
                 .value());
   ASSERT_TRUE(base::DirectoryExists(version_3));
 
@@ skipping 46 matching lines @@
       install_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
   ASSERT_FALSE(extension.get() == NULL);
   EXPECT_TRUE(error.empty());
 }
 
 TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesNoUnderscores) {
   base::ScopedTempDir temp;
   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"),
                                    data.c_str(), data.length()));
   std::string error;
   EXPECT_TRUE(extension_file_util::CheckForIllegalFilenames(temp.path(),
                                                             &error));
 }
 
 TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesOnlyReserved) {
   base::ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   const base::FilePath::CharType* folders[] =
       { extensions::kLocaleFolder, extensions::kPlatformSpecificFolder };
 
   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;
   EXPECT_TRUE(extension_file_util::CheckForIllegalFilenames(temp.path(),
                                                             &error));
 }
 
 TEST_F(ExtensionFileUtilTest, CheckIllegalFilenamesReservedAndIllegal) {
   base::ScopedTempDir temp;
   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(),
                                                              &error));
 }
 
 TEST_F(ExtensionFileUtilTest,
        LoadExtensionGivesHelpfullErrorOnMissingManifest) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
@@ skipping 162 matching lines @@
     "uOwrmnQYxaMReFV68Z2w9DcLZn07f7/R9Wn72z89CxwJAFsDoNaDes4h48bX7plct\n"
     "s9ACjmTwcCigZjN2K7AGv7ntCLF3DnV5dK0dTHNaAdD3SbY3jl29Rk2CwiURSX6Ee\n"
     "g==\n"
     "-----END PRIVATE KEY-----\n";
 
 TEST_F(ExtensionFileUtilTest, FindPrivateKeyFiles) {
   base::ScopedTempDir temp;
   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)));
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("second_key.pem"),
                                    private_key, arraysize(private_key)));
   // Shouldn't find a key with a different extension.
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("key.diff_ext"),
                                    private_key, arraysize(private_key)));
   // Shouldn't find a key that isn't parsable.
   ASSERT_TRUE(file_util::WriteFile(src_path.AppendASCII("unparsable_key.pem"),
                                    private_key, arraysize(private_key) - 30));
   std::vector<base::FilePath> private_keys =
       extension_file_util::FindPrivateKeyFiles(temp.path());
   EXPECT_EQ(2U, private_keys.size());
   EXPECT_THAT(private_keys,
               testing::Contains(src_path.AppendASCII("a_key.pem")));
   EXPECT_THAT(private_keys,
               testing::Contains(src_path.AppendASCII("second_key.pem")));
 }
 
 TEST_F(ExtensionFileUtilTest, WarnOnPrivateKey) {
   base::ScopedTempDir temp;
   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"
       "  \"name\": \"Test Extension\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"manifest_version\": 2,\n"
       "  \"description\": \"The first extension that I made.\"\n"
       "}\n";
   ASSERT_TRUE(file_util::WriteFile(ext_path.AppendASCII("manifest.json"),
                                    manifest, strlen(manifest)));
@@ skipping 61 matching lines @@
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
   EXPECT_TRUE(extension3.get() == NULL);
   EXPECT_STREQ("Could not load icon 'icon.png' for page action.",
                error.c_str());
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.