Revert of Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter.

chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.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/policy/configuration_policy_handler_chromeos.h"
 
 #include <string>
 
 #include "ash/magnifier/magnifier_constants.h"
 #include "base/callback.h"
@@ skipping 143 matching lines @@
 
   // Placeholder to insert in place of the filtered setting.
   const char kPlaceholder[] = "********";
 
   toplevel_dict = chromeos::onc::MaskCredentialsInOncObject(
       chromeos::onc::kToplevelConfigurationSignature,
       *toplevel_dict,
       kPlaceholder);
 
   base::JSONWriter::WriteWithOptions(toplevel_dict.get(),
-                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                     base::JSONWriter::OPTIONS_DO_NOT_ESCAPE |
+                                         base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &json_string);
   return base::Value::CreateStringValue(json_string);
 }
 
 PinnedLauncherAppsPolicyHandler::PinnedLauncherAppsPolicyHandler()
     : ExtensionListPolicyHandler(key::kPinnedLauncherApps,
                                  prefs::kPinnedLauncherApps,
                                  false) {}
 
 PinnedLauncherAppsPolicyHandler::~PinnedLauncherAppsPolicyHandler() {}
@@ skipping 84 matching lines @@
   const base::Value* value = policies.GetValue(policy_name());
   if (value && EnsureInRange(value, NULL, NULL)) {
     if (!prefs->GetValue(prefs::kPowerAcIdleAction, NULL))
       prefs->SetValue(prefs::kPowerAcIdleAction, value->DeepCopy());
     if (!prefs->GetValue(prefs::kPowerBatteryIdleAction, NULL))
       prefs->SetValue(prefs::kPowerBatteryIdleAction, value->DeepCopy());
   }
 }
 
 }  // namespace policy