summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi/file_system_operation_impl_unittest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:31:42 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:31:42 +0000
commita4f7378f973b38400f133958842eb36db0b61dcb (patch)
tree3ffb843e14698a63c4b5f1bac43cdcf1f4e1402e /content/browser/fileapi/file_system_operation_impl_unittest.cc
parent76b4b15804dafa5e586738bd7c8ac12fea6ddec2 (diff)
downloadchromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.zip
chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.gz
chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.bz2
Revert 239280 "Move more file_util functions to base namespace."
dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32). This CL is the only in the intersection of CLs in the first failing build on the two builders, so giving a speculative revert a try (rlarocque already tried a clobber, it didn't help). http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806 http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544 > Move more file_util functions to base namespace. > > TBR=sky > > Review URL: https://codereview.chromium.org/109043002 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/105823009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi/file_system_operation_impl_unittest.cc')
-rw-r--r--content/browser/fileapi/file_system_operation_impl_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc
index 445657d..236cc8e 100644
--- a/content/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -689,8 +689,8 @@ TEST_F(FileSystemOperationImplTest, TestCopyInForeignFileSuccess) {
// Compare contents of src and copied file.
char buffer[100];
- EXPECT_EQ(data_size, base::ReadFile(PlatformPath("dest/file"),
- buffer, data_size));
+ EXPECT_EQ(data_size, file_util::ReadFile(PlatformPath("dest/file"),
+ buffer, data_size));
for (int i = 0; i < data_size; ++i)
EXPECT_EQ(test_data[i], buffer[i]);
}
@@ -1009,7 +1009,7 @@ TEST_F(FileSystemOperationImplTest, TestTruncate) {
// data.
EXPECT_EQ(length, GetFileSize("file"));
char data[100];
- EXPECT_EQ(length, base::ReadFile(platform_path, data, length));
+ EXPECT_EQ(length, file_util::ReadFile(platform_path, data, length));
for (int i = 0; i < length; ++i) {
if (i < static_cast<int>(sizeof(test_data)))
EXPECT_EQ(test_data[i], data[i]);
@@ -1028,7 +1028,7 @@ TEST_F(FileSystemOperationImplTest, TestTruncate) {
// Check that its length is now 3 and that it contains only bits of test data.
EXPECT_EQ(length, GetFileSize("file"));
- EXPECT_EQ(length, base::ReadFile(platform_path, data, length));
+ EXPECT_EQ(length, file_util::ReadFile(platform_path, data, length));
for (int i = 0; i < length; ++i)
EXPECT_EQ(test_data[i], data[i]);