JSONWriter cleanup: integrate pretty print into write options.

chrome/browser/ui/webui/print_preview/print_preview_handler_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 "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_preview_unit_test_base.h"
@@ skipping 112 matching lines @@
     // Set the minimal dummy settings to make the HandlePrint() code happy.
     DictionaryValue settings;
     settings.SetBoolean(printing::kSettingPreviewModifiable, true);
     settings.SetInteger(printing::kSettingColor, printing::COLOR);
     settings.SetBoolean(printing::kSettingPrintToPDF, false);
     settings.SetInteger(printing::kSettingMarginsType,
                         printing::DEFAULT_MARGINS);
 
     // Put |settings| in to |args| as a JSON string.
     std::string json_string;
-    base::JSONWriter::Write(&settings, false, &json_string);
+    base::JSONWriter::Write(&settings, &json_string);
     ListValue args;
     args.Append(new base::StringValue(json_string));  // |args| takes ownership.
     preview_ui_->handler_->HandlePrint(&args);
   }
 
   void RequestPrintWithCustomMargins(
     const double margin_top, const double margin_right,
     const double margin_bottom, const double margin_left) {
     // Set the minimal dummy settings to make the HandlePrint() code happy.
     DictionaryValue settings;
     settings.SetBoolean(printing::kSettingPreviewModifiable, true);
     settings.SetInteger(printing::kSettingColor, printing::COLOR);
     settings.SetBoolean(printing::kSettingPrintToPDF, false);
     settings.SetInteger(printing::kSettingMarginsType,
                         printing::CUSTOM_MARGINS);
 
     // Creating custom margins dictionary and nesting it in |settings|.
     DictionaryValue* custom_settings = GetCustomMarginsDictionary(
         margin_top, margin_right, margin_bottom, margin_left);
     // |settings| takes ownership.
     settings.Set(printing::kSettingMarginsCustom, custom_settings);
 
     // Put |settings| in to |args| as a JSON string.
     std::string json_string;
-    base::JSONWriter::Write(&settings, false, &json_string);
+    base::JSONWriter::Write(&settings, &json_string);
     ListValue args;
     args.Append(new base::StringValue(json_string));  // |args| takes ownership.
     preview_ui_->handler_->HandlePrint(&args);
   }
 
   PrintPreviewUI* preview_ui_;
 
  private:
   void ClearStickySettings() {
     PrintPreviewHandler::GetStickySettings()->margins_type_ =
@@ skipping 98 matching lines @@
   double margin_value;
   EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginTop,
                                           &margin_value));
   EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginRight,
                                           &margin_value));
   EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginBottom,
                                           &margin_value));
   EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginLeft,
                                           &margin_value));
 }