Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / webkit / browser / fileapi / sandbox_origin_database_unittest.cc

diff --git a/src/webkit/browser/fileapi/sandbox_origin_database_unittest.cc b/src/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
index 340baf2..dd870eb 100644 (file)
--- a/src/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
+++ b/src/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "base/file_util.h"
+#include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/platform_file.h"
 #include "base/stl_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/db/filename.h"
@@ -36,7 +36,7 @@ TEST(SandboxOriginDatabaseTest, BasicTest) {
   EXPECT_FALSE(base::PathExists(kFSDir));
   EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
-  SandboxOriginDatabase database(kFSDir);
+  SandboxOriginDatabase database(kFSDir, NULL);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
@@ -66,7 +66,7 @@ TEST(SandboxOriginDatabaseTest, TwoPathTest) {
   EXPECT_FALSE(base::PathExists(kFSDir));
   EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
-  SandboxOriginDatabase database(kFSDir);
+  SandboxOriginDatabase database(kFSDir, NULL);
   std::string origin0("origin0");
   std::string origin1("origin1");
 
@@ -94,7 +94,7 @@ TEST(SandboxOriginDatabaseTest, DropDatabaseTest) {
   EXPECT_FALSE(base::PathExists(kFSDir));
   EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
-  SandboxOriginDatabase database(kFSDir);
+  SandboxOriginDatabase database(kFSDir, NULL);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
@@ -122,7 +122,7 @@ TEST(SandboxOriginDatabaseTest, DeleteOriginTest) {
   EXPECT_FALSE(base::PathExists(kFSDir));
   EXPECT_TRUE(base::CreateDirectory(kFSDir));
 
-  SandboxOriginDatabase database(kFSDir);
+  SandboxOriginDatabase database(kFSDir, NULL);
   std::string origin("origin");
 
   EXPECT_FALSE(database.HasOriginPath(origin));
@@ -151,7 +151,7 @@ TEST(SandboxOriginDatabaseTest, ListOriginsTest) {
 
   std::vector<SandboxOriginDatabase::OriginRecord> origins;
 
-  SandboxOriginDatabase database(kFSDir);
+  SandboxOriginDatabase database(kFSDir, NULL);
   EXPECT_TRUE(database.ListAllOrigins(&origins));
   EXPECT_TRUE(origins.empty());
   origins.clear();
@@ -208,7 +208,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
   };
 
   scoped_ptr<SandboxOriginDatabase> database(
-      new SandboxOriginDatabase(kFSDir));
+      new SandboxOriginDatabase(kFSDir, NULL));
   for (size_t i = 0; i < arraysize(kOrigins); ++i) {
     base::FilePath path;
     EXPECT_FALSE(database->HasOriginPath(kOrigins[i]));
@@ -224,15 +224,10 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
   const base::FilePath kGarbageDir = kFSDir.AppendASCII("foo");
   const base::FilePath kGarbageFile = kGarbageDir.AppendASCII("bar");
   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));
+  base::File file(kGarbageFile,
+                  base::File::FLAG_CREATE | base::File::FLAG_WRITE);
+  EXPECT_TRUE(file.IsValid());
+  file.Close();
 
   // Corrupt database itself and last log entry to drop last 1 database
   // operation.  The database should detect the corruption and should recover
@@ -242,7 +237,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
   CorruptDatabase(kDBDir, leveldb::kLogFile, -1, 1);
 
   base::FilePath path;
-  database.reset(new SandboxOriginDatabase(kFSDir));
+  database.reset(new SandboxOriginDatabase(kFSDir, NULL));
   std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
   EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
 
@@ -283,7 +278,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) {
     base::FilePath path;
 
     scoped_ptr<SandboxOriginDatabase> database(
-        new SandboxOriginDatabase(kFSDir));
+        new SandboxOriginDatabase(kFSDir, NULL));
     EXPECT_FALSE(database->HasOriginPath(kOrigin));
     EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
     EXPECT_FALSE(path.empty());
@@ -293,7 +288,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) {
 
     DeleteDatabaseFile(kDBDir, kLevelDBFileTypes[i]);
 
-    database.reset(new SandboxOriginDatabase(kFSDir));
+    database.reset(new SandboxOriginDatabase(kFSDir, NULL));
     std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
     EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));