Port DictionaryValue to use string16 instead of wstring.

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 58 matching lines @@
         }
         json_string_->append(real);
         break;
       }
 
     case Value::TYPE_STRING:
       {
         std::wstring value;
         bool result = node->GetAsString(&value);
         DCHECK(result);
-        AppendQuotedString(value);
+        AppendQuotedString(WideToUTF16Hack(value));
         break;
       }
 
     case Value::TYPE_LIST:
       {
         json_string_->append("[");
         if (pretty_print_)
           json_string_->append(" ");
 
         const ListValue* list = static_cast<const ListValue*>(node);
@@ skipping 58 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,
+void JSONWriter::AppendQuotedString(const string16& str) {
+  string_escape::JavascriptDoubleQuote(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, ' '));
 }