JSONWriter cleanup: integrate pretty print into write options.

chrome/browser/extensions/settings/settings_storage_unittest.cc

 // Copyright (c) 2011 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/extensions/settings/settings_storage_unittest.h"
 
 #include "base/json/json_writer.h"
 #include "base/file_util.h"
 #include "base/values.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 
 namespace {
 
 // To save typing SettingsStorage::DEFAULTS everywhere.
 const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS;
 
 // Gets the pretty-printed JSON for a value.
 std::string GetJSON(const Value& value) {
   std::string json;
-  base::JSONWriter::Write(&value, true, &json);
+  base::JSONWriter::WriteWithOptions(&value,
+                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                     &json);
   return json;
 }
 
 // Pretty-prints a set of strings.
 std::string ToString(const std::set<std::string>& strings) {
   std::string string("{");
   for (std::set<std::string>::const_iterator it = strings.begin();
       it != strings.end(); ++it) {
     if (it != strings.begin()) {
       string.append(", ");
@@ skipping 452 matching lines @@
     SettingChangeList changes;
     changes.push_back(SettingChange(key3_, val3_->DeepCopy(), NULL));
     changes.push_back(
         SettingChange("qwerty", val3_->DeepCopy(), NULL));
     EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
     EXPECT_PRED_FORMAT2(ChangesEq, SettingChangeList(), storage_->Clear());
   }
 }
 
 }  // namespace extensions