Add JSON-specific escaping, which has different rules from JS escaping.

base/json_writer.cc

 // Copyright (c) 2006-2008 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_writer.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "base/string_escape.h"
@@ skipping 74 matching lines @@
         } else if (real.length() > 1 && real[0] == '-' && real[1] == '.') {
           // "-.1" bad "-0.1" good
           real.insert(1, "0");
         }
         json_string_->append(real);
         break;
       }
 
     case Value::TYPE_STRING:
       {
+        std::string value;
+        bool result = node->GetAsString(&value);
+        DCHECK(result);
         if (escape) {
-          std::wstring value;
-          bool result = node->GetAsString(&value);
-          DCHECK(result);
-          AppendQuotedString(value);
+          string_escape::JsonDoubleQuote(UTF8ToUTF16(value),
+                                         true,
+                                         json_string_);
         } else {
-          std::string value;
-          bool result = node->GetAsString(&value);
-          DCHECK(result);
-          string_escape::JavascriptDoubleQuote(value, true, json_string_);
+          string_escape::JsonDoubleQuote(value, true, json_string_);
         }
         break;
       }
 
     case Value::TYPE_LIST:
       {
         json_string_->append("[");
         if (pretty_print_)
           json_string_->append(" ");
 
@@ skipping 60 matching lines @@
         break;
       }
 
     default:
       // TODO(jhughes): handle TYPE_BINARY
       NOTREACHED() << "unknown json type";
   }
 }
 
 void JSONWriter::AppendQuotedString(const std::wstring& str) {
-  string_escape::JavascriptDoubleQuote(WideToUTF16Hack(str),
-                                       true,
-                                       json_string_);
+  string_escape::JsonDoubleQuote(WideToUTF16Hack(str),
+                                 true,
+                                 json_string_);
 }
 
 void JSONWriter::IndentLine(int depth) {
   // It may be faster to keep an indent string so we don't have to keep
   // reallocating.
   json_string_->append(std::string(depth * 3, ' '));
 }