diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 18:23:50 +0000 |
| commit | 82f84b91a10f513cd59b8382a7ab00ed0f179bd5 (patch) | |
| tree | 125081aff715fbe6815e8bb81889d4d49f887cf3 /third_party/zlib | |
| parent | 88a8115978d75161674d97cde0761cbdba73daed (diff) | |
| download | chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.zip chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.gz chromium_src-82f84b91a10f513cd59b8382a7ab00ed0f179bd5.tar.bz2 | |
Move ReadFileToString to the base namespace.
BUG=
Review URL: https://codereview.chromium.org/19579005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/google/zip_reader_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc index 4fec4643..09efd9a 100644 --- a/third_party/zlib/google/zip_reader_unittest.cc +++ b/third_party/zlib/google/zip_reader_unittest.cc @@ -217,8 +217,8 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryToFilePath_RegularFile) { test_dir_.AppendASCII("quux.txt"))); // Read the output file ans compute the MD5. std::string output; - ASSERT_TRUE(file_util::ReadFileToString(test_dir_.AppendASCII("quux.txt"), - &output)); + ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"), + &output)); const std::string md5 = base::MD5String(output); const std::string kExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6"; EXPECT_EQ(kExpectedMD5, md5); @@ -238,8 +238,8 @@ TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFilePath_RegularFile) { test_dir_.AppendASCII("quux.txt"))); // Read the output file and compute the MD5. std::string output; - ASSERT_TRUE(file_util::ReadFileToString(test_dir_.AppendASCII("quux.txt"), - &output)); + ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"), + &output)); const std::string md5 = base::MD5String(output); const std::string kExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6"; EXPECT_EQ(kExpectedMD5, md5); @@ -261,8 +261,8 @@ TEST_F(ZipReaderTest, PlatformFileExtractCurrentEntryToFd_RegularFile) { ASSERT_TRUE(reader.ExtractCurrentEntryToFd(out_fd_w.platform_file())); // Read the output file and compute the MD5. std::string output; - ASSERT_TRUE(file_util::ReadFileToString(test_dir_.AppendASCII("quux.txt"), - &output)); + ASSERT_TRUE(base::ReadFileToString(test_dir_.AppendASCII("quux.txt"), + &output)); const std::string md5 = base::MD5String(output); const std::string kExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6"; EXPECT_EQ(kExpectedMD5, md5); @@ -293,7 +293,7 @@ TEST_F(ZipReaderTest, ExtractCurrentEntryIntoDirectory_RegularFile) { ASSERT_TRUE(base::DirectoryExists(test_dir_.AppendASCII("foo/bar"))); // And the file should be created. std::string output; - ASSERT_TRUE(file_util::ReadFileToString( + ASSERT_TRUE(base::ReadFileToString( test_dir_.AppendASCII("foo/bar/quux.txt"), &output)); const std::string md5 = base::MD5String(output); const std::string kExpectedMD5 = "d1ae4ac8a17a0e09317113ab284b57a6"; @@ -423,7 +423,7 @@ TEST_F(ZipReaderTest, OpenFromString) { test_dir_.AppendASCII("test.txt"))); std::string actual; - ASSERT_TRUE(file_util::ReadFileToString( + ASSERT_TRUE(base::ReadFileToString( test_dir_.AppendASCII("test.txt"), &actual)); EXPECT_EQ(std::string("This is a test.\n"), actual); } |