JSONWriter cleanup: integrate pretty print into write options.

chrome/browser/chromeos/cros/network_parser.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/browser/chromeos/cros/network_parser.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/stringprintf.h"
 #include "base/values.h"
@@ skipping 28 matching lines @@
        iter != info.end_keys(); ++iter) {
     const std::string& key = *iter;
     base::Value* value;
     bool result = info.GetWithoutPathExpansion(key, &value);
     DCHECK(result);
     if (result)
       UpdateStatus(key, *value, device, NULL);
   }
   if (VLOG_IS_ON(2)) {
     std::string json;
-    base::JSONWriter::Write(&info, true, &json);
+    base::JSONWriter::WriteWithOptions(&info,
+                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                       &json);
     VLOG(2) << "Updated device for path "
             << device->device_path() << ": " << json;
   }
   return true;
 }
 
 bool NetworkDeviceParser::UpdateStatus(const std::string& key,
                                        const base::Value& value,
                                        NetworkDevice* device,
                                        PropertyIndex* index) {
   PropertyIndex found_index = mapper().Get(key);
   if (index)
     *index = found_index;
   if (!ParseValue(found_index, value, device)) {
     VLOG(1) << "NetworkDeviceParser: Unhandled key: " << key;
     return false;
   }
   if (VLOG_IS_ON(2)) {
     std::string value_json;
-    base::JSONWriter::Write(&value, true, &value_json);
+    base::JSONWriter::WriteWithOptions(&value,
+                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                       &value_json);
     VLOG(2) << "Updated value on device: "
             << device->device_path() << "[" << key << "] = " << value_json;
   }
   return true;
 }
 
 NetworkDevice* NetworkDeviceParser::CreateNewNetworkDevice(
     const std::string&device_path) {
   return new NetworkDevice(device_path);
 }
@@ skipping 51 matching lines @@
     *index = found_index;
   network->UpdatePropertyMap(found_index, &value);
   if (!ParseValue(found_index, value, network)) {
     VLOG(1) << "Unhandled key '" << key << "' in Network: " << network->name()
             << " ID: " << network->unique_id()
             << " Type: " << ConnectionTypeToString(network->type());
     return false;
   }
   if (VLOG_IS_ON(2)) {
     std::string value_json;
-    base::JSONWriter::Write(&value, true, &value_json);
+    base::JSONWriter::WriteWithOptions(&value,
+                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                       &value_json);
     VLOG(2) << "Updated value on network: "
             << network->unique_id() << "[" << key << "] = " << value_json;
   }
   return true;
 }
 
 Network* NetworkParser::CreateNewNetwork(
     ConnectionType type, const std::string& service_path) {
   switch (type) {
     case TYPE_ETHERNET: {
@@ skipping 66 matching lines @@
           static_cast<base::DictionaryValue*>(ui_data.get()));
       return true;
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace chromeos