JSONWriter cleanup: integrate pretty print into write options.

chrome/browser/sync/test/integration/extension_settings_helper.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/sync/test/integration/extension_settings_helper.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 using content::BrowserThread;
 using extensions::SettingsStorage;
 using sync_datatype_helper::test;
 
 namespace extension_settings_helper {
 
 namespace {
 
 std::string ToJson(const Value& value) {
   std::string json;
-  base::JSONWriter::Write(&value, true /* pretty print */, &json);
+  base::JSONWriter::WriteWithOptions(&value,
+                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                     &json);
   return json;
 }
 
 void GetAllSettingsOnFileThread(
     scoped_ptr<DictionaryValue>* out,
     base::WaitableEvent* signal,
     SettingsStorage* storage) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   out->reset(storage->Get().settings().DeepCopy());
   signal->Signal();
@@ skipping 67 matching lines @@
   bool all_profiles_same = true;
   for (int i = 0; i < test()->num_clients(); ++i) {
     // &= so that all profiles are tested; analogous to EXPECT over ASSERT.
     all_profiles_same &=
         AreSettingsSame(test()->verifier(), test()->GetProfile(i));
   }
   return all_profiles_same;
 }
 
 }  // namespace extension_settings_helper