JSONWriter cleanup: integrate pretty print into write options.

base/json/json_string_value_serializer.cc

Index: base/json/json_string_value_serializer.cc
diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc
index 94e660e0c69840788db11055831163eaf0e196e3..3045fa5a57f560a19db2366c491d11f32aee9980 100644
--- a/base/json/json_string_value_serializer.cc
+++ b/base/json/json_string_value_serializer.cc
@@ -24,11 +24,13 @@ bool JSONStringValueSerializer::SerializeInternal(const Value& root,
   if (!json_string_ || initialized_with_const_string_)
     return false;
 
-  base::JSONWriter::WriteWithOptions(
-      &root,
-      pretty_print_,
-      omit_binary_values ? base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES : 0,
-      json_string_);
+  int options = 0;
+  if (omit_binary_values)
+    options |= base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES;
+  if (pretty_print_)
+    options |= base::JSONWriter::OPTIONS_PRETTY_PRINT;
+
+  base::JSONWriter::WriteWithOptions(&root, options, json_string_);
   return true;
 }
 
@@ -42,4 +44,3 @@ Value* JSONStringValueSerializer::Deserialize(int* error_code,
                                               error_code,
                                               error_str);
 }
-