Redo escaping in GN

tools/gn/ninja_build_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_build_writer.h"
 
 #include <fstream>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
   base::FilePath executable;
   PathService::Get(base::FILE_EXE, &executable);
 
   CommandLine cmdline(executable.NormalizePathSeparatorsTo('/'));
   cmdline.AppendArg("gen");
   cmdline.AppendArg(build_settings->build_dir().value());
   cmdline.AppendSwitchPath("--root", build_settings->root_path());
   cmdline.AppendSwitch("-q");  // Don't write output.
 
   EscapeOptions escape_shell;
-  escape_shell.mode = ESCAPE_SHELL;
+  escape_shell.mode = ESCAPE_NINJA_COMMAND;
 #if defined(OS_WIN)
   // The command line code quoting varies by platform. We have one string,
   // possibly with spaces, that we want to quote. The Windows command line
   // quotes again, so we don't want quoting. The Posix one doesn't.
   escape_shell.inhibit_quoting = true;
 #endif
 
   const CommandLine& our_cmdline = *CommandLine::ForCurrentProcess();
   const CommandLine::SwitchMap& switches = our_cmdline.GetSwitches();
   for (CommandLine::SwitchMap::const_iterator i = switches.begin();
@@ skipping 22 matching lines @@
     const BuildSettings* build_settings,
     const std::vector<const Settings*>& all_settings,
     const std::vector<const Target*>& default_toolchain_targets,
     std::ostream& out,
     std::ostream& dep_out)
     : build_settings_(build_settings),
       all_settings_(all_settings),
       default_toolchain_targets_(default_toolchain_targets),
       out_(out),
       dep_out_(dep_out),
-      path_output_(build_settings->build_dir(), ESCAPE_NINJA, false),
+      path_output_(build_settings->build_dir(), ESCAPE_NINJA),
       helper_(build_settings) {
 }
 
 NinjaBuildWriter::~NinjaBuildWriter() {
 }
 
 void NinjaBuildWriter::Run() {
   WriteNinjaRules();
   WriteSubninjas();
   WritePhonyAndAllRules();
@@ skipping 148 matching lines @@
   EscapeOptions ninja_escape;
   ninja_escape.mode = ESCAPE_NINJA;
 
   // Escape for special chars Ninja will handle.
   std::string escaped = EscapeString(phony_name, ninja_escape, NULL);
 
   out_ << "build " << escaped << ": phony ";
   path_output_.WriteFile(out_, target_file);
   out_ << std::endl;
 }