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

Unified Diff: base/json/json_file_value_serializer.h

Issue 925783002: Split ValueSerializer into separate Serializer and Deserializer classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed cpplint warnings. Created 5 years, 10 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 | « no previous file | base/json/json_file_value_serializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/json/json_file_value_serializer.h
diff --git a/base/json/json_file_value_serializer.h b/base/json/json_file_value_serializer.h
index 6cfcbe83c2f8295fcd5f277bf637b6afda809e2a..aab47eec2dc269f64126207bc42030bfd3650c3a 100644
--- a/base/json/json_file_value_serializer.h
+++ b/base/json/json_file_value_serializer.h
@@ -14,10 +14,9 @@
class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer {
public:
- // |json_file_path_| is the path of a file that will be source of the
- // deserialization or the destination of the serialization.
- // When deserializing, the file should exist, but when serializing, the
- // serializer will attempt to create the file at the specified location.
+ // |json_file_path_| is the path of a file that will be destination of the
+ // serialization. The serializer will attempt to create the file at the
+ // specified location.
explicit JSONFileValueSerializer(const base::FilePath& json_file_path);
~JSONFileValueSerializer() override;
@@ -36,6 +35,22 @@ class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer {
// output.
bool SerializeAndOmitBinaryValues(const base::Value& root);
+ private:
+ bool SerializeInternal(const base::Value& root, bool omit_binary_values);
+
+ const base::FilePath json_file_path_;
+
+ DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer);
+};
+
+class BASE_EXPORT JSONFileValueDeserializer : public base::ValueDeserializer {
+ public:
+ // |json_file_path_| is the path of a file that will be source of the
+ // deserialization.
+ explicit JSONFileValueDeserializer(const base::FilePath& json_file_path);
+
+ ~JSONFileValueDeserializer() override;
+
// Attempt to deserialize the data structure encoded in the file passed
// in to the constructor into a structure of Value objects. If the return
// value is NULL, and if |error_code| is non-null, |error_code| will
@@ -69,22 +84,20 @@ class BASE_EXPORT JSONFileValueSerializer : public base::ValueSerializer {
allow_trailing_comma_ = new_value;
}
- // Returns the syze (in bytes) of JSON string read from disk in the last
+ // Returns the size (in bytes) of JSON string read from disk in the last
// successful |Deserialize()| call.
size_t get_last_read_size() const { return last_read_size_; }
private:
- bool SerializeInternal(const base::Value& root, bool omit_binary_values);
+ // A wrapper for ReadFileToString which returns a non-zero JsonFileError if
+ // there were file errors.
+ int ReadFileToString(std::string* json_string);
const base::FilePath json_file_path_;
bool allow_trailing_comma_;
size_t last_read_size_;
- // 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);
+ DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueDeserializer);
};
#endif // BASE_JSON_JSON_FILE_VALUE_SERIALIZER_H_
« no previous file with comments | « no previous file | base/json/json_file_value_serializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698