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

components/plugins/renderer/plugin_placeholder.cc

 // Copyright 2013 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 "components/plugins/renderer/plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_piece.h"
@@ skipping 147 matching lines @@
 void PluginPlaceholder::WillDestroyPlugin() { delete this; }
 
 void PluginPlaceholder::SetMessage(const string16& message) {
   message_ = message;
   if (finished_loading_)
     UpdateMessage();
 }
 
 void PluginPlaceholder::UpdateMessage() {
   std::string script =
-      "window.setMessage(" + base::GetQuotedJSONString(message_) + ")";
+      "window.setMessage(" + base::GetDoubleQuotedJson(message_) + ")";
   plugin_->web_view()->mainFrame()->executeScript(
       WebScriptSource(ASCIIToUTF16(script)));
 }
 
 void PluginPlaceholder::ShowContextMenu(const WebMouseEvent& event) {
   // Does nothing by default. Will be overridden if a specific browser wants
   // a context menu.
   return;
 }
 
@@ skipping 67 matching lines @@
   return render_frame_;
 }
 
 blink::WebFrame* PluginPlaceholder::GetFrame() { return frame_; }
 
 const blink::WebPluginParams& PluginPlaceholder::GetPluginParams() const {
   return plugin_params_;
 }
 
 }  // namespace plugins