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

chrome/browser/spellchecker/spelling_service_client.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/spellchecker/spelling_service_client.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
@@ skipping 51 matching lines @@
   DCHECK(pref);
 
   std::string language_code;
   std::string country_code;
   chrome::spellcheck_common::GetISOLanguageCountryCodeFromLocale(
       pref->GetString(prefs::kSpellCheckDictionary),
       &language_code,
       &country_code);
 
   // Format the JSON request to be sent to the Spelling service.
-  std::string encoded_text = base::GetQuotedJSONString(text);
+  std::string encoded_text;
+  base::JsonDoubleQuote(text, false, &encoded_text);
 
   static const char kSpellingRequest[] =
       "{"
       "\"method\":\"spelling.check\","
       "\"apiVersion\":\"v%d\","
       "\"params\":{"
-      "\"text\":%s,"
+      "\"text\":\"%s\","
       "\"language\":\"%s\","
       "\"originCountry\":\"%s\","
       "\"key\":%s"
       "}"
       "}";
-  std::string api_key = base::GetQuotedJSONString(google_apis::GetAPIKey());
+  std::string api_key = base::GetDoubleQuotedJson(google_apis::GetAPIKey());
   std::string request = base::StringPrintf(
       kSpellingRequest,
       type,
       encoded_text.c_str(),
       language_code.c_str(),
       country_code.c_str(),
       api_key.c_str());
 
   GURL url = GURL(kSpellingServiceURL);
   net::URLFetcher* fetcher = CreateURLFetcher(url);
@@ skipping 158 matching lines @@
     fetcher->GetResponseAsString(&data);
     success = ParseResponse(data, &results);
   }
   callback_data->callback.Run(success, callback_data->text, results);
   spellcheck_fetchers_.erase(fetcher.get());
 }
 
 net::URLFetcher* SpellingServiceClient::CreateURLFetcher(const GURL& url) {
   return net::URLFetcher::Create(url, net::URLFetcher::POST, this);
 }