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

chrome/test/chromedriver/chrome/adb_impl.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 "chrome/test/chromedriver/chrome/adb_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
@@ skipping 101 matching lines @@
   return Status(kUnknownError, "Failed to forward ports to device " +
                 device_serial + ": " + response);
 }
 
 Status AdbImpl::SetCommandLineFile(const std::string& device_serial,
                                    const std::string& command_line_file,
                                    const std::string& exec_name,
                                    const std::string& args) {
   std::string response;
   std::string quoted_command =
-      base::GetQuotedJSONString(exec_name + " " + args);
+      base::GetDoubleQuotedJson(exec_name + " " + args);
   Status status = ExecuteHostShellCommand(
       device_serial,
       base::StringPrintf("echo %s > %s; echo $?",
                          quoted_command.c_str(),
                          command_line_file.c_str()),
       &response);
   if (!status.IsOk())
     return status;
   if (response.find("0") == std::string::npos)
     return Status(kUnknownError, "Failed to set command line file " +
@@ skipping 106 matching lines @@
 
 Status AdbImpl::ExecuteHostShellCommand(
     const std::string& device_serial,
     const std::string& shell_command,
     std::string* response) {
   return ExecuteCommand(
       "host:transport:" + device_serial + "|shell:" + shell_command,
       response);
 }