Move Posix file utils to the base namespace.

sql/connection_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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "sql/connection.h"
 #include "sql/meta_table.h"
@@ skipping 671 matching lines @@
   // will need to be updated.
   EXPECT_TRUE(db().Execute("CREATE TABLE x (x)"));
 
   base::FilePath journal(db_path().value() + FILE_PATH_LITERAL("-journal"));
   int mode;
 
   // Given a permissive umask, the database is created with permissive
   // read access for the database and journal.
   ASSERT_TRUE(base::PathExists(db_path()));
   ASSERT_TRUE(base::PathExists(journal));
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(db_path(), &mode));
-  ASSERT_NE((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(journal, &mode));
-  ASSERT_NE((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(db_path(), &mode));
+  ASSERT_NE((mode & base::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(journal, &mode));
+  ASSERT_NE((mode & base::FILE_PERMISSION_USER_MASK), mode);
 
   // Re-open with restricted permissions and verify that the modes
   // changed for both the main database and the journal.
   db().Close();
   db().set_restrict_to_user();
   ASSERT_TRUE(db().Open(db_path()));
   ASSERT_TRUE(base::PathExists(db_path()));
   ASSERT_TRUE(base::PathExists(journal));
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(db_path(), &mode));
-  ASSERT_EQ((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(journal, &mode));
-  ASSERT_EQ((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(db_path(), &mode));
+  ASSERT_EQ((mode & base::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(journal, &mode));
+  ASSERT_EQ((mode & base::FILE_PERMISSION_USER_MASK), mode);
 
   // Delete and re-create the database, the restriction should still apply.
   db().Close();
   sql::Connection::Delete(db_path());
   ASSERT_TRUE(db().Open(db_path()));
   ASSERT_TRUE(base::PathExists(db_path()));
   ASSERT_FALSE(base::PathExists(journal));
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(db_path(), &mode));
-  ASSERT_EQ((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(db_path(), &mode));
+  ASSERT_EQ((mode & base::FILE_PERMISSION_USER_MASK), mode);
 
   // Verify that journal creation inherits the restriction.
   EXPECT_TRUE(db().Execute("CREATE TABLE x (x)"));
   ASSERT_TRUE(base::PathExists(journal));
-  mode = file_util::FILE_PERMISSION_MASK;
-  EXPECT_TRUE(file_util::GetPosixFilePermissions(journal, &mode));
-  ASSERT_EQ((mode & file_util::FILE_PERMISSION_USER_MASK), mode);
+  mode = base::FILE_PERMISSION_MASK;
+  EXPECT_TRUE(base::GetPosixFilePermissions(journal, &mode));
+  ASSERT_EQ((mode & base::FILE_PERMISSION_USER_MASK), mode);
 }
 #endif  // defined(OS_POSIX)
 
 // Test that errors start happening once Poison() is called.
 TEST_F(SQLConnectionTest, Poison) {
   EXPECT_TRUE(db().Execute("CREATE TABLE x (x)"));
 
   // Before the Poison() call, things generally work.
   EXPECT_TRUE(db().IsSQLValid("INSERT INTO x VALUES ('x')"));
   EXPECT_TRUE(db().Execute("INSERT INTO x VALUES ('x')"));
@@ skipping 77 matching lines @@
   }
 
   // Detach succeeds outside of a transaction.
   db().RollbackTransaction();
   EXPECT_TRUE(db().DetachDatabase(kAttachmentPoint));
 
   EXPECT_FALSE(db().IsSQLValid("SELECT count(*) from other.bar"));
 }
 
 }  // namespace