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

chrome/browser/spellchecker/spelling_service_client.cc

Index: chrome/browser/spellchecker/spelling_service_client.cc
diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc
index ab15a3ecb46b9dee7b9bfc4f1170eb232267401e..dbe92a310b4a68c64e762a11b95449fffad0e023 100644
--- a/chrome/browser/spellchecker/spelling_service_client.cc
+++ b/chrome/browser/spellchecker/spelling_service_client.cc
@@ -69,20 +69,21 @@
       &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,