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 /base/json | |
| 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 'base/json')
| -rw-r--r-- | base/json/json_file_value_serializer.cc | 2 | ||||
| -rw-r--r-- | base/json/json_file_value_serializer.h | 4 | ||||
| -rw-r--r-- | base/json/json_reader_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/base/json/json_file_value_serializer.cc b/base/json/json_file_value_serializer.cc index 37371e8..70d0c88 100644 --- a/base/json/json_file_value_serializer.cc +++ b/base/json/json_file_value_serializer.cc @@ -46,7 +46,7 @@ bool JSONFileValueSerializer::SerializeInternal(const base::Value& root, int JSONFileValueSerializer::ReadFileToString(std::string* json_string) { DCHECK(json_string); - if (!file_util::ReadFileToString(json_file_path_, json_string)) { + if (!base::ReadFileToString(json_file_path_, json_string)) { #if defined(OS_WIN) int error = ::GetLastError(); if (error == ERROR_SHARING_VIOLATION || error == ERROR_LOCK_VIOLATION) { diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h index 4a0c334..8006373 100644 --- a/base/json/json_file_value_serializer.h +++ b/base/json/json_file_value_serializer.h @@ -77,8 +77,8 @@ class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer { base::FilePath json_file_path_; bool allow_trailing_comma_; - // A wrapper for file_util::ReadFileToString which returns a non-zero - // JsonFileError if there were file errors. + // A wrapper for ReadFileToString which returns a non-zero JsonFileError if + // there were file errors. int ReadFileToString(std::string* json_string); DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer); diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc index 527cb97..eceb538 100644 --- a/base/json/json_reader_unittest.cc +++ b/base/json/json_reader_unittest.cc @@ -547,7 +547,7 @@ TEST(JSONReaderTest, ReadFromFile) { ASSERT_TRUE(base::PathExists(path)); std::string input; - ASSERT_TRUE(file_util::ReadFileToString( + ASSERT_TRUE(ReadFileToString( path.Append(FILE_PATH_LITERAL("bom_feff.json")), &input)); JSONReader reader; |