JSONWriter cleanup: integrate pretty print into write options.

chrome/test/webdriver/webdriver_util.cc

 // Copyright (c) 2012 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 "chrome/test/webdriver/webdriver_util.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
@@ skipping 374 matching lines @@
   if (!second_file.empty()) {
     *error_msg = "Zip contained multiple files";
     return false;
   }
   *file = first_file;
   return true;
 }
 
 std::string JsonStringify(const Value* value) {
   std::string json;
-  base::JSONWriter::Write(value, false, &json);
+  base::JSONWriter::Write(value, &json);
   return json;
 }
 
 namespace {
 
 // Truncates the given string to 100 characters, adding an ellipsis if
 // truncation was necessary.
 void TruncateString(std::string* data) {
   const size_t kMaxLength = 100;
   if (data->length() > kMaxLength) {
@@ skipping 43 matching lines @@
   if (value->IsType(Value::TYPE_STRING)) {
     std::string data;
     value->GetAsString(&data);
     TruncateString(&data);
     copy.reset(Value::CreateStringValue(data));
   } else {
     copy.reset(value->DeepCopy());
     TruncateContainedStrings(copy.get());
   }
   std::string json;
-  base::JSONWriter::Write(copy.get(), true /* pretty_print */, &json);
+  base::JSONWriter::WriteWithOptions(copy.get(),
+                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                     &json);
   return json;
 }
 
 const char* GetJsonTypeName(Value::Type type) {
   switch (type) {
     case Value::TYPE_NULL:
       return "null";
     case Value::TYPE_BOOLEAN:
       return "boolean";
     case Value::TYPE_INTEGER:
@@ skipping 79 matching lines @@
 
 bool ValueConversionTraits<webdriver::SkipParsing>::SetFromValue(
     const Value* value, const webdriver::SkipParsing* t) {
   return true;
 }
 
 bool ValueConversionTraits<webdriver::SkipParsing>::CanConvert(
     const Value* value) {
   return true;
 }