Redo escaping in GN

tools/gn/path_output.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/path_output.h"
 
 #include "build/build_config.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/output_file.h"
 #include "tools/gn/string_utils.h"
 
-PathOutput::PathOutput(const SourceDir& current_dir,
-                       EscapingMode escaping,
-                       bool convert_slashes)
+PathOutput::PathOutput(const SourceDir& current_dir, EscapingMode escaping)
     : current_dir_(current_dir) {
   CHECK(current_dir.is_source_absolute())
       << "Currently this only supports writing to output directories inside "
          "the source root. There needs to be some tweaks to PathOutput to make "
          "doing this work correctly.";
   inverse_current_dir_ = InvertDir(current_dir_);
 
   options_.mode = escaping;
-  options_.convert_slashes = convert_slashes;
-  options_.inhibit_quoting = false;
-
-  if (convert_slashes)
-    ConvertPathToSystem(&inverse_current_dir_);
 }
 
 PathOutput::~PathOutput() {
 }
 
 void PathOutput::WriteFile(std::ostream& out, const SourceFile& file) const {
   WritePathStr(out, file.value());
 }
 
 void PathOutput::WriteDir(std::ostream& out,
@@ skipping 46 matching lines @@
 
 void PathOutput::WriteFile(std::ostream& out,
                            const base::FilePath& file) const {
   // Assume native file paths are always absolute.
   EscapeStringToStream(out, FilePathToUTF8(file), options_);
 }
 
 void PathOutput::WriteSourceRelativeString(
     std::ostream& out,
     const base::StringPiece& str) const {
-  if (options_.mode == ESCAPE_SHELL) {
+  if (options_.mode == ESCAPE_NINJA_COMMAND) {
     // Shell escaping needs an intermediate string since it may end up
-    // quoting the whole thing. On Windows, the slashes may already be
-    // converted to backslashes in inverse_current_dir_, but we assume that on
-    // Windows the escaper won't try to then escape the preconverted
-    // backslashes and will just pass them, so this is fine.
+    // quoting the whole thing.
     std::string intermediate;
     intermediate.reserve(inverse_current_dir_.size() + str.size());
     intermediate.assign(inverse_current_dir_.c_str(),
                         inverse_current_dir_.size());
     intermediate.append(str.data(), str.size());
 
     EscapeStringToStream(out,
         base::StringPiece(intermediate.c_str(), intermediate.size()),
         options_);
   } else {
@@ skipping 21 matching lines @@
     // it's system-absolute.
 #if defined(OS_WIN)
     // On Windows, trim the leading slash, since the input for absolute
     // paths will look like "/C:/foo/bar.txt".
     EscapeStringToStream(out, str.substr(1), options_);
 #else
     EscapeStringToStream(out, str, options_);
 #endif
   }
 }