summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 18:23:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 18:23:50 +0000
commit82f84b91a10f513cd59b8382a7ab00ed0f179bd5 (patch)
tree125081aff715fbe6815e8bb81889d4d49f887cf3 /extensions
parent88a8115978d75161674d97cde0761cbdba73daed (diff)
downloadchromium_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 'extensions')
-rw-r--r--extensions/browser/file_reader.cc2
-rw-r--r--extensions/browser/file_reader_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/browser/file_reader.cc b/extensions/browser/file_reader.cc
index f1a5600..3ca74eb 100644
--- a/extensions/browser/file_reader.cc
+++ b/extensions/browser/file_reader.cc
@@ -27,6 +27,6 @@ FileReader::~FileReader() {}
void FileReader::ReadFileOnBackgroundThread() {
std::string data;
- bool success = file_util::ReadFileToString(resource_.GetFilePath(), &data);
+ bool success = base::ReadFileToString(resource_.GetFilePath(), &data);
origin_loop_->PostTask(FROM_HERE, base::Bind(callback_, success, data));
}
diff --git a/extensions/browser/file_reader_unittest.cc b/extensions/browser/file_reader_unittest.cc
index 17a466c..120ad66 100644
--- a/extensions/browser/file_reader_unittest.cc
+++ b/extensions/browser/file_reader_unittest.cc
@@ -61,7 +61,7 @@ void RunBasicTest(const char* filename) {
path = path.AppendASCII(filename);
std::string file_contents;
- ASSERT_TRUE(file_util::ReadFileToString(path, &file_contents));
+ ASSERT_TRUE(base::ReadFileToString(path, &file_contents));
Receiver receiver;