diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 20:42:30 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 20:42:30 +0000 |
| commit | e5c2a22eb106e0fef92bbf80ac8bf2429980cc4e (patch) | |
| tree | 480bf91e3cf64d69f837a2f22f8fc868bf17dfdc /webkit/browser | |
| parent | 06b1d42b0ceadd4a70b7462c5c7e6adeb5a18ca4 (diff) | |
| download | chromium_src-e5c2a22eb106e0fef92bbf80ac8bf2429980cc4e.zip chromium_src-e5c2a22eb106e0fef92bbf80ac8bf2429980cc4e.tar.gz chromium_src-e5c2a22eb106e0fef92bbf80ac8bf2429980cc4e.tar.bz2 | |
Move WriteFile and WriteFileDescriptor from file_util to base namespace.
R=viettrungluu@chromium.org
TBR=viettrungluu
Review URL: https://codereview.chromium.org/184563006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser')
6 files changed, 20 insertions, 21 deletions
diff --git a/webkit/browser/appcache/appcache_database_unittest.cc b/webkit/browser/appcache/appcache_database_unittest.cc index 641ab06..c432066 100644 --- a/webkit/browser/appcache/appcache_database_unittest.cc +++ b/webkit/browser/appcache/appcache_database_unittest.cc @@ -57,7 +57,7 @@ TEST(AppCacheDatabaseTest, ReCreate) { const base::FilePath kNestedDir = temp_dir.path().AppendASCII("nested"); const base::FilePath kOtherFile = kNestedDir.AppendASCII("other_file"); EXPECT_TRUE(base::CreateDirectory(kNestedDir)); - EXPECT_EQ(3, file_util::WriteFile(kOtherFile, "foo", 3)); + EXPECT_EQ(3, base::WriteFile(kOtherFile, "foo", 3)); AppCacheDatabase db(kDbFile); EXPECT_FALSE(db.LazyOpen(false)); @@ -90,7 +90,7 @@ TEST(AppCacheDatabaseTest, QuickIntegrityCheck) { const base::FilePath kDbFile = mock_dir.AppendASCII("appcache.db"); const base::FilePath kOtherFile = mock_dir.AppendASCII("other_file"); - EXPECT_EQ(3, file_util::WriteFile(kOtherFile, "foo", 3)); + EXPECT_EQ(3, base::WriteFile(kOtherFile, "foo", 3)); // First create a valid db file. AppCacheDatabase db(kDbFile); @@ -150,7 +150,7 @@ TEST(AppCacheDatabaseTest, ExperimentalFlags) { ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); const base::FilePath kDbFile = temp_dir.path().AppendASCII("appcache.db"); const base::FilePath kOtherFile = temp_dir.path().AppendASCII("other_file"); - EXPECT_EQ(3, file_util::WriteFile(kOtherFile, "foo", 3)); + EXPECT_EQ(3, base::WriteFile(kOtherFile, "foo", 3)); EXPECT_TRUE(base::PathExists(kOtherFile)); AppCacheDatabase db(kDbFile); diff --git a/webkit/browser/appcache/appcache_storage_impl_unittest.cc b/webkit/browser/appcache/appcache_storage_impl_unittest.cc index e894004..7eba545 100644 --- a/webkit/browser/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/browser/appcache/appcache_storage_impl_unittest.cc @@ -1658,7 +1658,7 @@ class AppCacheStorageImplTest : public testing::Test { ASSERT_TRUE(base::CreateDirectory(disk_cache_directory)); base::FilePath index_file = disk_cache_directory.AppendASCII("index"); EXPECT_EQ(static_cast<int>(kCorruptData.length()), - file_util::WriteFile( + base::WriteFile( index_file, kCorruptData.data(), kCorruptData.length())); } diff --git a/webkit/browser/blob/local_file_stream_reader_unittest.cc b/webkit/browser/blob/local_file_stream_reader_unittest.cc index 43001ef..1e46476 100644 --- a/webkit/browser/blob/local_file_stream_reader_unittest.cc +++ b/webkit/browser/blob/local_file_stream_reader_unittest.cc @@ -66,7 +66,7 @@ class LocalFileStreamReaderTest : public testing::Test { ASSERT_TRUE(file_thread_.Start()); ASSERT_TRUE(dir_.CreateUniqueTempDir()); - file_util::WriteFile(test_path(), kTestData, kTestDataSize); + base::WriteFile(test_path(), kTestData, kTestDataSize); base::File::Info info; ASSERT_TRUE(base::GetFileInfo(test_path(), &info)); test_file_modification_time_ = info.last_modified; diff --git a/webkit/browser/database/database_tracker_unittest.cc b/webkit/browser/database/database_tracker_unittest.cc index 6422ac1..2e8b121 100644 --- a/webkit/browser/database/database_tracker_unittest.cc +++ b/webkit/browser/database/database_tracker_unittest.cc @@ -229,11 +229,11 @@ class DatabaseTracker_TestHelper_Test { EXPECT_TRUE(base::CreateDirectory( tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( tracker->GetOriginDirectory(kOrigin2))))); - EXPECT_EQ(1, file_util::WriteFile( + EXPECT_EQ(1, base::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); - EXPECT_EQ(2, file_util::WriteFile( + EXPECT_EQ(2, base::WriteFile( tracker->GetFullDBFilePath(kOrigin2, kDB2), "aa", 2)); - EXPECT_EQ(3, file_util::WriteFile( + EXPECT_EQ(3, base::WriteFile( tracker->GetFullDBFilePath(kOrigin2, kDB3), "aaa", 3)); tracker->DatabaseModified(kOrigin1, kDB1); tracker->DatabaseModified(kOrigin2, kDB2); @@ -261,7 +261,7 @@ class DatabaseTracker_TestHelper_Test { EXPECT_TRUE(base::CreateDirectory( tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( tracker->GetOriginDirectory(kOrigin1))))); - EXPECT_EQ(1, file_util::WriteFile( + EXPECT_EQ(1, base::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); tracker->DatabaseModified(kOrigin1, kDB1); @@ -357,11 +357,11 @@ class DatabaseTracker_TestHelper_Test { EXPECT_TRUE(base::CreateDirectory( tracker->DatabaseDirectory().Append(base::FilePath::FromUTF16Unsafe( tracker->GetOriginDirectory(kOrigin2))))); - EXPECT_EQ(1, file_util::WriteFile( + EXPECT_EQ(1, base::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB1), "a", 1)); - EXPECT_EQ(2, file_util::WriteFile( + EXPECT_EQ(2, base::WriteFile( tracker->GetFullDBFilePath(kOrigin2, kDB2), "aa", 2)); - EXPECT_EQ(4, file_util::WriteFile( + EXPECT_EQ(4, base::WriteFile( tracker->GetFullDBFilePath(kOrigin1, kDB3), "aaaa", 4)); tracker->DatabaseModified(kOrigin1, kDB1); CheckNotificationReceived(&observer1, kOrigin1, kDB1, 1); diff --git a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc index 96bccf6..53c559a 100644 --- a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc +++ b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc @@ -70,7 +70,7 @@ class LocalFileStreamWriterTest : public testing::Test { base::FilePath CreateFileWithContent(const std::string& name, const std::string& data) { base::FilePath path = Path(name); - file_util::WriteFile(path, data.c_str(), data.size()); + base::WriteFile(path, data.c_str(), data.size()); return path; } diff --git a/webkit/browser/fileapi/sandbox_prioritized_origin_database_unittest.cc b/webkit/browser/fileapi/sandbox_prioritized_origin_database_unittest.cc index 3a290cf..c93b839 100644 --- a/webkit/browser/fileapi/sandbox_prioritized_origin_database_unittest.cc +++ b/webkit/browser/fileapi/sandbox_prioritized_origin_database_unittest.cc @@ -123,8 +123,7 @@ TEST(SandboxPrioritizedOriginDatabaseTest, LostPrimaryOriginFileTest) { EXPECT_TRUE(database.GetPathForOrigin(kOrigin1, &path)); // Corrupt the primary origin file. - file_util::WriteFile( - database.primary_origin_file(), kData.data(), kData.size()); + base::WriteFile(database.primary_origin_file(), kData.data(), kData.size()); // Reset the database. database.DropDatabase(); @@ -164,15 +163,15 @@ TEST(SandboxPrioritizedOriginDatabaseTest, MigrationTest) { old_dir_db_path1 = dir.path().Append(path1); ASSERT_TRUE(base::CreateDirectory(old_dir_db_path1)); EXPECT_EQ(static_cast<int>(kFakeDirectoryData1.size()), - file_util::WriteFile(old_dir_db_path1.AppendASCII("dummy"), - kFakeDirectoryData1.data(), - kFakeDirectoryData1.size())); + base::WriteFile(old_dir_db_path1.AppendASCII("dummy"), + kFakeDirectoryData1.data(), + kFakeDirectoryData1.size())); old_dir_db_path2 = dir.path().Append(path2); ASSERT_TRUE(base::CreateDirectory(old_dir_db_path2)); EXPECT_EQ(static_cast<int>(kFakeDirectoryData2.size()), - file_util::WriteFile(old_dir_db_path2.AppendASCII("dummy"), - kFakeDirectoryData2.data(), - kFakeDirectoryData2.size())); + base::WriteFile(old_dir_db_path2.AppendASCII("dummy"), + kFakeDirectoryData2.data(), + kFakeDirectoryData2.size())); } // Re-open the directory using sandboxPrioritizedOriginDatabase. |