Move directory creation functions to base namespace.

webkit/browser/fileapi/sandbox_origin_database_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 <algorithm>
 #include <functional>
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
     FILE_PATH_LITERAL("File System");
 const base::FilePath::CharType kOriginDatabaseName[] =
     FILE_PATH_LITERAL("Origins");
 }  // namespace
 
 TEST(SandboxOriginDatabaseTest, BasicTest) {
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   SandboxOriginDatabase database(kFSDir);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
   // Double-check to make sure that had no side effects.
   EXPECT_FALSE(database.HasOriginPath(origin));
 
   base::FilePath path0;
   base::FilePath path1;
 
   // Empty strings aren't valid origins.
   EXPECT_FALSE(database.GetPathForOrigin(std::string(), &path0));
 
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
   EXPECT_TRUE(database.HasOriginPath(origin));
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
   EXPECT_FALSE(path0.empty());
   EXPECT_FALSE(path1.empty());
   EXPECT_EQ(path0, path1);
 
   EXPECT_TRUE(base::PathExists(kFSDir.Append(kOriginDatabaseName)));
 }
 
 TEST(SandboxOriginDatabaseTest, TwoPathTest) {
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   SandboxOriginDatabase database(kFSDir);
   std::string origin0("origin0");
   std::string origin1("origin1");
 
   EXPECT_FALSE(database.HasOriginPath(origin0));
   EXPECT_FALSE(database.HasOriginPath(origin1));
 
   base::FilePath path0;
   base::FilePath path1;
   EXPECT_TRUE(database.GetPathForOrigin(origin0, &path0));
   EXPECT_TRUE(database.HasOriginPath(origin0));
   EXPECT_FALSE(database.HasOriginPath(origin1));
   EXPECT_TRUE(database.GetPathForOrigin(origin1, &path1));
   EXPECT_TRUE(database.HasOriginPath(origin1));
   EXPECT_FALSE(path0.empty());
   EXPECT_FALSE(path1.empty());
   EXPECT_NE(path0, path1);
 
   EXPECT_TRUE(base::PathExists(kFSDir.Append(kOriginDatabaseName)));
 }
 
 TEST(SandboxOriginDatabaseTest, DropDatabaseTest) {
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   SandboxOriginDatabase database(kFSDir);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
 
   base::FilePath path0;
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
   EXPECT_TRUE(database.HasOriginPath(origin));
   EXPECT_FALSE(path0.empty());
 
   EXPECT_TRUE(base::PathExists(kFSDir.Append(kOriginDatabaseName)));
 
   database.DropDatabase();
 
   base::FilePath path1;
   EXPECT_TRUE(database.HasOriginPath(origin));
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
   EXPECT_FALSE(path1.empty());
   EXPECT_EQ(path0, path1);
 }
 
 TEST(SandboxOriginDatabaseTest, DeleteOriginTest) {
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   SandboxOriginDatabase database(kFSDir);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
   EXPECT_TRUE(database.RemovePathForOrigin(origin));
 
   base::FilePath path0;
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
   EXPECT_TRUE(database.HasOriginPath(origin));
   EXPECT_FALSE(path0.empty());
 
   EXPECT_TRUE(database.RemovePathForOrigin(origin));
   EXPECT_FALSE(database.HasOriginPath(origin));
 
   base::FilePath path1;
   EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
   EXPECT_FALSE(path1.empty());
   EXPECT_NE(path0, path1);
 }
 
 TEST(SandboxOriginDatabaseTest, ListOriginsTest) {
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   std::vector<SandboxOriginDatabase::OriginRecord> origins;
 
   SandboxOriginDatabase database(kFSDir);
   EXPECT_TRUE(database.ListAllOrigins(&origins));
   EXPECT_TRUE(origins.empty());
   origins.clear();
 
   std::string origin0("origin0");
   std::string origin1("origin1");
@@ skipping 29 matching lines @@
   // In this test, we'll register some origins to the origin database, then
   // corrupt database and its log file.
   // After repairing, the origin database should be consistent even when some
   // entries lost.
 
   base::ScopedTempDir dir;
   ASSERT_TRUE(dir.CreateUniqueTempDir());
   const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
   const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName);
   EXPECT_FALSE(base::PathExists(kFSDir));
-  EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+  EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
   const std::string kOrigins[] = {
     "foo.example.com",
     "bar.example.com",
     "baz.example.com",
     "hoge.example.com",
     "fuga.example.com",
   };
 
   scoped_ptr<SandboxOriginDatabase> database(
       new SandboxOriginDatabase(kFSDir));
   for (size_t i = 0; i < arraysize(kOrigins); ++i) {
     base::FilePath path;
     EXPECT_FALSE(database->HasOriginPath(kOrigins[i]));
     EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path));
     EXPECT_FALSE(path.empty());
     EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path));
 
     if (i != 1)
-      EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path)));
+      EXPECT_TRUE(base::CreateDirectory(kFSDir.Append(path)));
   }
   database.reset();
 
   const base::FilePath kGarbageDir = kFSDir.AppendASCII("foo");
   const base::FilePath kGarbageFile = kGarbageDir.AppendASCII("bar");
-  EXPECT_TRUE(file_util::CreateDirectory(kGarbageDir));
+  EXPECT_TRUE(base::CreateDirectory(kGarbageDir));
   bool created = false;
   base::PlatformFileError error;
   base::PlatformFile file = base::CreatePlatformFile(
       kGarbageFile,
       base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_WRITE,
       &created, &error);
   EXPECT_EQ(base::PLATFORM_FILE_OK, error);
   EXPECT_TRUE(created);
   EXPECT_TRUE(base::ClosePlatformFile(file));
 
@@ skipping 33 matching lines @@
     leveldb::kTempFile,
     leveldb::kInfoLogFile,
   };
 
   for (size_t i = 0; i < arraysize(kLevelDBFileTypes); ++i) {
     base::ScopedTempDir dir;
     ASSERT_TRUE(dir.CreateUniqueTempDir());
     const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
     const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName);
     EXPECT_FALSE(base::PathExists(kFSDir));
-    EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
+    EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
     const std::string kOrigin = "foo.example.com";
     base::FilePath path;
 
     scoped_ptr<SandboxOriginDatabase> database(
         new SandboxOriginDatabase(kFSDir));
     EXPECT_FALSE(database->HasOriginPath(kOrigin));
     EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
     EXPECT_FALSE(path.empty());
     EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
-    EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path)));
+    EXPECT_TRUE(base::CreateDirectory(kFSDir.Append(path)));
     database.reset();
 
     DeleteDatabaseFile(kDBDir, kLevelDBFileTypes[i]);
 
     database.reset(new SandboxOriginDatabase(kFSDir));
     std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
     EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
 
     const std::string kOrigin2("piyo.example.org");
     EXPECT_FALSE(database->HasOriginPath(kOrigin2));
     EXPECT_TRUE(database->GetPathForOrigin(kOrigin2, &path));
     EXPECT_FALSE(path.empty());
     EXPECT_TRUE(database->HasOriginPath(kOrigin2));
   }
 }
 
 }  // namespace fileapi