diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
| commit | 7600d0b2d5e37b211280d5109a6b726644d6be76 (patch) | |
| tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /net/disk_cache | |
| parent | a4f7378f973b38400f133958842eb36db0b61dcb (diff) | |
| download | chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.zip chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.gz chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.bz2 | |
Revert 239400 "Revert 239280 "Move more file_util functions to b..."
Broke all bots 9_9
> 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
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/100923007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/backend_unittest.cc | 2 | ||||
| -rw-r--r-- | net/disk_cache/cache_util_unittest.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index c7b37e4..b25001f 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -489,7 +489,7 @@ TEST_F(DiskCacheBackendTest, ExternalFiles) { // And verify that the first file is still there. scoped_refptr<net::IOBuffer> buffer2(new net::IOBuffer(kSize)); - ASSERT_EQ(kSize, file_util::ReadFile(filename, buffer2->data(), kSize)); + ASSERT_EQ(kSize, base::ReadFile(filename, buffer2->data(), kSize)); EXPECT_EQ(0, memcmp(buffer1->data(), buffer2->data(), kSize)); } diff --git a/net/disk_cache/cache_util_unittest.cc b/net/disk_cache/cache_util_unittest.cc index b86290f..3a05196 100644 --- a/net/disk_cache/cache_util_unittest.cc +++ b/net/disk_cache/cache_util_unittest.cc @@ -21,16 +21,16 @@ class CacheUtilTest : public PlatformTest { dir1_ = base::FilePath(cache_dir_.Append(FILE_PATH_LITERAL("dir01"))); file3_ = base::FilePath(dir1_.Append(FILE_PATH_LITERAL("file03"))); ASSERT_TRUE(base::CreateDirectory(cache_dir_)); - FILE *fp = file_util::OpenFile(file1_, "w"); + FILE *fp = base::OpenFile(file1_, "w"); ASSERT_TRUE(fp != NULL); - file_util::CloseFile(fp); - fp = file_util::OpenFile(file2_, "w"); + base::CloseFile(fp); + fp = base::OpenFile(file2_, "w"); ASSERT_TRUE(fp != NULL); - file_util::CloseFile(fp); + base::CloseFile(fp); ASSERT_TRUE(base::CreateDirectory(dir1_)); - fp = file_util::OpenFile(file3_, "w"); + fp = base::OpenFile(file3_, "w"); ASSERT_TRUE(fp != NULL); - file_util::CloseFile(fp); + base::CloseFile(fp); dest_dir_ = tmp_dir_.path().Append(FILE_PATH_LITERAL("old_Cache_001")); dest_file1_ = base::FilePath(dest_dir_.Append(FILE_PATH_LITERAL("file01"))); dest_file2_ = |