Redo escaping in GN

tools/gn/ninja_action_target_writer.cc

 // Copyright (c) 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 "tools/gn/ninja_action_target_writer.h"
 
 #include "base/strings/string_util.h"
 #include "tools/gn/err.h"
 #include "tools/gn/file_template.h"
 #include "tools/gn/string_utils.h"
 #include "tools/gn/target.h"
 
 NinjaActionTargetWriter::NinjaActionTargetWriter(const Target* target,
                                                  const Toolchain* toolchain,
                                                  std::ostream& out)
     : NinjaTargetWriter(target, toolchain, out),
       path_output_no_escaping_(
           target->settings()->build_settings()->build_dir(),
-          ESCAPE_NONE, false) {
+          ESCAPE_NONE) {
 }
 
 NinjaActionTargetWriter::~NinjaActionTargetWriter() {
 }
 
 void NinjaActionTargetWriter::Run() {
   FileTemplate args_template(target_->action_values().args());
   std::string custom_rule_name = WriteRuleDefinition(args_template);
 
   // Collect our deps to pass as "extra hard dependencies" for input deps. This
@@ skipping 107 matching lines @@
   return custom_rule_name;
 }
 
 void NinjaActionTargetWriter::WriteArgsSubstitutions(
     const SourceFile& source,
     const FileTemplate& args_template) {
   std::ostringstream source_file_stream;
   path_output_no_escaping_.WriteFile(source_file_stream, source);
 
   EscapeOptions template_escape_options;
-  template_escape_options.mode = ESCAPE_NINJA_SHELL;
-  template_escape_options.inhibit_quoting = true;
+  template_escape_options.mode = ESCAPE_NINJA_COMMAND;
 
   args_template.WriteNinjaVariablesForSubstitution(
       out_, source_file_stream.str(), template_escape_options);
 }
 
 void NinjaActionTargetWriter::WriteSourceRules(
     const std::string& custom_rule_name,
     const std::string& implicit_deps,
     const FileTemplate& args_template,
     std::vector<OutputFile>* output_files) {
@@ skipping 76 matching lines @@
 }
 
 FileTemplate NinjaActionTargetWriter::GetDepfileTemplate() const {
   std::vector<std::string> template_args;
   std::string depfile_relative_to_build_dir =
       RemovePrefix(target_->action_values().depfile().value(),
                    settings_->build_settings()->build_dir().value());
   template_args.push_back(depfile_relative_to_build_dir);
   return FileTemplate(template_args);
 }