JSONWriter cleanup: integrate pretty print into write options.

net/test/remote_test_server.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 "net/test/remote_test_server.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
@@ skipping 70 matching lines @@
   base::DictionaryValue arguments_dict;
   if (!GenerateArguments(&arguments_dict))
     return false;
 
   // Append the 'server-type' argument which is used by spawner server to
   // pass right server type to Python test server.
   arguments_dict.SetString("server-type", GetServerTypeString(type()));
 
   // Generate JSON-formatted argument string.
   std::string arguments_string;
-  base::JSONWriter::Write(&arguments_dict, false, &arguments_string);
+  base::JSONWriter::Write(&arguments_dict, &arguments_string);
   if (arguments_string.empty())
     return false;
 
   // Start the Python test server on the remote machine.
   uint16 test_server_port;
   if (!spawner_communicator_->StartServer(arguments_string,
                                           &test_server_port)) {
     return false;
   }
   if (0 == test_server_port)
     return false;
 
   // Construct server data to initialize BaseTestServer::server_data_.
   base::DictionaryValue server_data_dict;
   // At this point, the test server should be spawned on the host. Update the
   // local port to real port of Python test server, which will be forwarded to
   // the remote server.
   server_data_dict.SetInteger("port", test_server_port);
   std::string server_data;
-  base::JSONWriter::Write(&server_data_dict, false, &server_data);
+  base::JSONWriter::Write(&server_data_dict, &server_data);
   if (server_data.empty() || !ParseServerData(server_data)) {
     LOG(ERROR) << "Could not parse server_data: " << server_data;
     return false;
   }
 
   return SetupWhenServerStarted();
 }
 
 bool RemoteTestServer::Stop() {
   CleanUpWhenStoppingServer();
@@ skipping 37 matching lines @@
 
   SetResourcePath(document_root, FilePath().AppendASCII("net")
                                            .AppendASCII("data")
                                            .AppendASCII("ssl")
                                            .AppendASCII("certificates"));
   return true;
 }
 
 }  // namespace net