JSONWriter cleanup: integrate pretty print into write options.

chrome/browser/extensions/settings/settings_sync_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 16 matching lines @@
 namespace util = settings_test_util;
 
 namespace {
 
 // To save typing SettingsStorage::DEFAULTS everywhere.
 const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS;
 
 // Gets the pretty-printed JSON for a value.
 static 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;
 }
 
 // Returns whether two Values are equal.
 testing::AssertionResult ValuesEq(
     const char* _1, const char* _2,
     const Value* expected,
     const Value* actual) {
   if (expected == actual) {
     return testing::AssertionSuccess();
@@ skipping 1233 matching lines @@
     DictionaryValue expected;
     expected.Set("large_value", large_value.DeepCopy());
     EXPECT_PRED_FORMAT2(SettingsEq, expected, storage1->Get());
     EXPECT_PRED_FORMAT2(SettingsEq, expected, storage2->Get());
   }
 
   GetSyncableService(model_type)->StopSyncing(model_type);
 }
 
 }  // namespace extensions