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

chrome/browser/search/iframe_source.cc

Index: chrome/browser/search/iframe_source.cc
diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc
index 16d6c416ca5cd43b10b777e6b858f2a5f8885df8..b44ed3046c88b9fdd8e88bca658548cb0b84201f 100644
--- a/chrome/browser/search/iframe_source.cc
+++ b/chrome/browser/search/iframe_source.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/search/iframe_source.h"
 
+#include "base/json/string_escape.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
@@ -86,6 +87,8 @@
     return;
   }
 
+  std::string js_escaped_origin;
+  base::JsonDoubleQuote(origin, false, &js_escaped_origin);
   base::StringPiece template_js =
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
   std::string response(template_js.as_string());