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

base/json/json_value_serializer.cc

 // 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.
 
 #include "base/json/json_value_serializer.h"
 
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 
 const char* JSONFileValueSerializer::kAccessDenied = "Access denied.";
 const char* JSONFileValueSerializer::kCannotReadFile = "Can't read file.";
 const char* JSONFileValueSerializer::kFileLocked = "File locked.";
 const char* JSONFileValueSerializer::kNoSuchFile = "File doesn't exist.";
 
 JSONStringValueSerializer::~JSONStringValueSerializer() {}
 
 bool JSONStringValueSerializer::Serialize(const Value& root) {
+  return SerializeWithOptionalBinaryValues(root, false);
+}
+
+bool JSONStringValueSerializer::SerializeWithOptionalBinaryValues(
+      const Value& root, bool omit_binary_values) {
   if (!json_string_ || initialized_with_const_string_)
     return false;
 
-  base::JSONWriter::Write(&root, pretty_print_, json_string_);
+  base::JSONWriter::WriteWithOptions(
+      &root,
+      pretty_print_,
+      omit_binary_values ? base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES : 0,
+      json_string_);
   return true;
 }
 
 Value* JSONStringValueSerializer::Deserialize(int* error_code,
                                               std::string* error_str) {
   if (!json_string_)
     return NULL;
 
   return base::JSONReader::ReadAndReturnError(*json_string_,
                                               allow_trailing_comma_,
                                               error_code,
                                               error_str);
 }
 
 /******* File Serializer *******/
 
 bool JSONFileValueSerializer::Serialize(const Value& root) {
+  return SerializeWithOptionalBinaryValues(root, false);
+}
+
+bool JSONFileValueSerializer::SerializeWithOptionalBinaryValues(
+      const Value& root, bool omit_binary_values) {
   std::string json_string;
   JSONStringValueSerializer serializer(&json_string);
   serializer.set_pretty_print(true);
-  bool result = serializer.Serialize(root);
+  bool result = serializer.SerializeWithOptionalBinaryValues(
+        root, omit_binary_values);
   if (!result)
     return false;
 
   int data_size = static_cast<int>(json_string.size());
   if (file_util::WriteFile(json_file_path_,
                            json_string.data(),
                            data_size) != data_size)
     return false;
 
   return true;
@@ skipping 44 matching lines @@
     if (error_code)
       *error_code = error;
     if (error_str)
       *error_str = GetErrorMessageForCode(error);
     return NULL;
   }
 
   JSONStringValueSerializer serializer(json_string);
   return serializer.Deserialize(error_code, error_str);
 }