Redo escaping in GN

tools/gn/file_template.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/file_template.h"
 
 #include <algorithm>
 #include <iostream>
 
 #include "tools/gn/escape.h"
@@ skipping 148 matching lines @@
       if (t[subrange_i].type == Subrange::LITERAL)
         cur_output.append(t[subrange_i].literal);
       else
         cur_output.append(subst[t[subrange_i].type]);
     }
   }
 }
 
 void FileTemplate::WriteWithNinjaExpansions(std::ostream& out) const {
   EscapeOptions escape_options;
-  escape_options.mode = ESCAPE_NINJA_SHELL;
+  escape_options.mode = ESCAPE_NINJA_COMMAND;
   escape_options.inhibit_quoting = true;
 
   for (size_t template_i = 0;
        template_i < templates_.container().size(); template_i++) {
     out << " ";  // Separate args with spaces.
 
     const Template& t = templates_[template_i];
 
     // Escape each subrange into a string. Since we're writing out Ninja
     // variables, we can't quote the whole thing, so we write in pieces, only
     // escaping the literals, and then quoting the whole thing at the end if
     // necessary.
     bool needs_quoting = false;
     std::string item_str;
     for (size_t subrange_i = 0; subrange_i < t.container().size();
          subrange_i++) {
       if (t[subrange_i].type == Subrange::LITERAL) {
+        bool cur_needs_quoting = false;
         item_str.append(EscapeString(t[subrange_i].literal, escape_options,
-                                     &needs_quoting));
+                                     &cur_needs_quoting));
+        needs_quoting |= cur_needs_quoting;
       } else {
         // Don't escape this since we need to preserve the $.
         item_str.append("${");
         item_str.append(GetNinjaVariableNameForType(t[subrange_i].type));
         item_str.append("}");
       }
     }
 
     if (needs_quoting || item_str.empty()) {
       // Need to shell quote the whole string. We also need to quote empty
@@ skipping 107 matching lines @@
       cur = next + arraysize(kSourceFilePart) - 1;
     } else {
       // If it's not a match, treat it like a one-char literal (this will be
       // rare, so it's not worth the bother to add to the previous literal) so
       // we can keep going.
       t.container().push_back(Subrange(Subrange::LITERAL, "{"));
       cur = next + 1;
     }
   }
 }