JSONWriter cleanup: integrate pretty print into write options.

chrome/test/webdriver/webdriver_automation.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_automation.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 858 matching lines @@
     automation::Error auto_error;
     if (!SendSetLocalStatePreferenceJSONRequest(
             automation(), pref, scoped_value.release(), &auto_error))
       *error = Error::FromAutomationError(auto_error);
   } else {
     std::string request, response;
     DictionaryValue request_dict;
     request_dict.SetString("command", "SetLocalStatePrefs");
     request_dict.SetString("path", pref);
     request_dict.Set("value", scoped_value.release());
-    base::JSONWriter::Write(&request_dict, false, &request);
+    base::JSONWriter::Write(&request_dict, &request);
     if (!automation()->GetBrowserWindow(0)->SendJSONRequest(
             request, -1, &response)) {
       *error = new Error(kUnknownError, base::StringPrintf(
           "Failed to set local state pref '%s'", pref.c_str()));
     }
   }
 }
 
 void Automation::SetPreference(const std::string& pref,
                                base::Value* value,
                                Error** error) {
   scoped_ptr<Value> scoped_value(value);
   // Chrome 17 is on the 963 branch. The first released 18 build should have
   // the new SetPrefs method which uses a browser index instead of handle.
   if (build_no_ >= 964) {
     automation::Error auto_error;
     if (!SendSetPreferenceJSONRequest(
             automation(), pref, scoped_value.release(), &auto_error))
       *error = Error::FromAutomationError(auto_error);
   } else {
     std::string request, response;
     DictionaryValue request_dict;
     request_dict.SetString("command", "SetPrefs");
     request_dict.SetInteger("windex", 0);
     request_dict.SetString("path", pref);
     request_dict.Set("value", scoped_value.release());
-    base::JSONWriter::Write(&request_dict, false, &request);
+    base::JSONWriter::Write(&request_dict, &request);
     if (!automation()->GetBrowserWindow(0)->SendJSONRequest(
             request, -1, &response)) {
       *error = new Error(kUnknownError, base::StringPrintf(
           "Failed to set pref '%s'", pref.c_str()));
     }
   }
 }
 
 AutomationProxy* Automation::automation() const {
   return launcher_->automation();
@@ skipping 48 matching lines @@
   return CheckVersion(750, message);
 }
 
 Error* Automation::CheckNewExtensionInterfaceSupported() {
   const char* message =
       "Extension interface is not supported for this version of Chrome";
   return CheckVersion(947, message);
 }
 
 }  // namespace webdriver