Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1698)

Unified Diff: third_party/zlib/google/zip_reader_unittest.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/android/native_test_util.cc ('k') | tools/android/device_stats_monitor/device_stats_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/google/zip_reader_unittest.cc
diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc
index 4fec464341be7eb683391c29015e2e1033a0a074..09efd9a7a669ec0707853111f8394ed9998a61d9 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);
}
« no previous file with comments | « testing/android/native_test_util.cc ('k') | tools/android/device_stats_monitor/device_stats_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698