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

chrome/renderer/searchbox/searchbox_extension.cc

 // Copyright 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/renderer/searchbox/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 442 matching lines @@
   v8::Handle<v8::Value> v = frame->executeScriptAndReturnValue(
       blink::WebScriptSource(kSupportsInstantScript));
   return !v.IsEmpty() && v->BooleanValue();
 }
 
 // static
 void SearchBoxExtension::DispatchChromeIdentityCheckResult(
     blink::WebFrame* frame,
     const base::string16& identity,
     bool identity_match) {
-  std::string escaped_identity = base::GetQuotedJSONString(identity);
+  std::string escaped_identity;
+  base::JsonDoubleQuote(identity, true, &escaped_identity);
   blink::WebString script(UTF8ToUTF16(base::StringPrintf(
       kDispatchChromeIdentityCheckResult,
       escaped_identity.c_str(),
       identity_match ? "true" : "false")));
   Dispatch(frame, script);
 }
 
 // static
 void SearchBoxExtension::DispatchFocusChange(blink::WebFrame* frame) {
   Dispatch(frame, kDispatchFocusChangedScript);
@@ skipping 565 matching lines @@
   if (!render_view) return;
 
   bool display_instant_results =
       SearchBox::Get(render_view)->display_instant_results();
   DVLOG(1) << render_view << " GetDisplayInstantResults" <<
       display_instant_results;
   args.GetReturnValue().Set(display_instant_results);
 }
 
 }  // namespace extensions_v8