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

Unified Diff: content/browser/download/download_file_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 | « content/browser/download/download_browsertest.cc ('k') | content/browser/gpu/gpu_pixel_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/download_file_unittest.cc
diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc
index 49e418c85bc6100afea4b1cb210293600aa09450..dcc0e424bd299dd49d0d878b6d59640562e514ac 100644
--- a/content/browser/download/download_file_unittest.cc
+++ b/content/browser/download/download_file_unittest.cc
@@ -164,8 +164,7 @@ class DownloadFileTest : public testing::Test {
// Make sure the data has been properly written to disk.
std::string disk_data;
- EXPECT_TRUE(file_util::ReadFileToString(download_file_->FullPath(),
- &disk_data));
+ EXPECT_TRUE(base::ReadFileToString(download_file_->FullPath(), &disk_data));
EXPECT_EQ(expected_data_, disk_data);
// Make sure the Browser and File threads outlive the DownloadFile
@@ -417,7 +416,7 @@ TEST_F(DownloadFileTest, RenameFileFinal) {
ASSERT_EQ(static_cast<int>(sizeof(file_data) - 1),
file_util::WriteFile(path_5, file_data, sizeof(file_data) - 1));
ASSERT_TRUE(base::PathExists(path_5));
- EXPECT_TRUE(file_util::ReadFileToString(path_5, &file_contents));
+ EXPECT_TRUE(base::ReadFileToString(path_5, &file_contents));
EXPECT_EQ(std::string(file_data), file_contents);
EXPECT_EQ(DOWNLOAD_INTERRUPT_REASON_NONE,
@@ -425,7 +424,7 @@ TEST_F(DownloadFileTest, RenameFileFinal) {
EXPECT_EQ(path_5, output_path);
file_contents = "";
- EXPECT_TRUE(file_util::ReadFileToString(path_5, &file_contents));
+ EXPECT_TRUE(base::ReadFileToString(path_5, &file_contents));
EXPECT_NE(std::string(file_data), file_contents);
DestroyDownloadFile(0);
« no previous file with comments | « content/browser/download/download_browsertest.cc ('k') | content/browser/gpu/gpu_pixel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698