Allow JSONWriter and JSONValueSerializer to omit binary values when instructed to do so.

base/json/json_value_serializer.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_JSON_JSON_VALUE_SERIALIZER_H_
 #define BASE_JSON_JSON_VALUE_SERIALIZER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 18 matching lines @@
   // deserialization only.
   explicit JSONStringValueSerializer(const std::string& json_string)
       : json_string_(&const_cast<std::string&>(json_string)),
         initialized_with_const_string_(true),
         pretty_print_(false),
         allow_trailing_comma_(false) {
   }
 
   virtual ~JSONStringValueSerializer();
 
+  // Equivalent to calling Serialize(root, false).
+  virtual bool Serialize(const Value& root);
+
   // Attempt to serialize the data structure represented by Value into
   // JSON.  If the return value is true, the result will have been written
-  // into the string passed into the constructor.
-  virtual bool Serialize(const Value& root);
+  // into the string passed into the constructor. |ignore_binary_values| is
+  // used to indicate how the serializer should behave when encountering a
+  // binary value.
+  virtual bool Serialize(const Value& root, bool ignore_binary_values);

[willchan no longer on Chromium, 2011/11/10 18:33:07]

No overloading, and why is this virtual, it's not overriding anything. Please
apply OVERRIDE where you are overriding a virtual.

[Eric Dingle, 2011/11/10 23:19:57]

Done.

 
   // Attempt to deserialize the data structure encoded in the string 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
   // contain an integer error code (either JsonFileError or JsonParseError).
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   // The caller takes ownership of the returned value.
   virtual Value* Deserialize(int* error_code, std::string* error_message);
 
@@ skipping 18 matching lines @@
  public:
   // json_file_patch 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.
   explicit JSONFileValueSerializer(const FilePath& json_file_path)
     : json_file_path_(json_file_path) {}
 
   virtual ~JSONFileValueSerializer() {}
 
+  // Equivalent to calling Serialize(root, false).
+  virtual bool Serialize(const Value& root);
+
   // DO NOT USE except in unit tests to verify the file was written properly.
   // We should never serialize directly to a file since this will block the
   // thread. Instead, serialize to a string and write to the file you want on
   // the file thread.
   //
   // Attempt to serialize the data structure represented by Value into
   // JSON.  If the return value is true, the result will have been written
   // into the file whose name was passed into the constructor.
-  virtual bool Serialize(const Value& root);
+  virtual bool Serialize(const Value& root, bool ignore_binary_values);
 
   // 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
   // contain an integer error code (either JsonFileError or JsonParseError).
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   // The caller takes ownership of the returned value.
   virtual Value* Deserialize(int* error_code, std::string* error_message);
 
@@ skipping 20 matching lines @@
   FilePath json_file_path_;
 
   // A wrapper for file_util::ReadFileToString which returns a non-zero
   // JsonFileError if there were file errors.
   int ReadFileToString(std::string* json_string);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer);
 };
 
 #endif  // BASE_JSON_JSON_VALUE_SERIALIZER_H_