GN: Bug fixes in process_file_template

tools/gn/substitution_writer.h

 // Copyright 2014 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.
 
 #ifndef TOOLS_GN_SUBSTITUTION_WRITER_H_
 #define TOOLS_GN_SUBSTITUTION_WRITER_H_
 
 #include <iosfwd>
 #include <vector>
 
@@ skipping 16 matching lines @@
  public:
   enum OutputStyle {
     OUTPUT_ABSOLUTE,  // Dirs will be absolute "//foo/bar".
     OUTPUT_RELATIVE,  // Dirs will be relative to a given directory.
   };
 
   SubstitutionWriter();
   ~SubstitutionWriter();
 
   // Applies the substitution pattern to a source file, returning the result
-  // as either a SourceFile or OutputFile.
+  // as either a string, a SourceFile or an OutputFile. If the result is
+  // expected to be a SourceFile or an OutputFile, this will CHECK if the
+  // result isn't in the correct directory. The caller should validate this
+  // first (see for example IsFileInOuputDir).
   static SourceFile ApplyPatternToSource(
       const Settings* settings,
       const SubstitutionPattern& pattern,
       const SourceFile& source);
+  static std::string ApplyPatternToSourceAsString(
+      const Settings* settings,
+      const SubstitutionPattern& pattern,
+      const SourceFile& source);
   static OutputFile ApplyPatternToSourceAsOutputFile(
       const Settings* settings,
       const SubstitutionPattern& pattern,
       const SourceFile& source);
 
   // Applies the substitution list to a source, APPENDING the result to the
   // given output vector. It works this way so one can call multiple times to
   // apply to multiple files and create a list. The result can either be
   // SourceFiles or OutputFiles.
   static void ApplyListToSource(
       const Settings* settings,
       const SubstitutionList& list,
       const SourceFile& source,
       std::vector<SourceFile>* output);
+  static void ApplyListToSourceAsString(
+      const Settings* settings,
+      const SubstitutionList& list,
+      const SourceFile& source,
+      std::vector<std::string>* output);
   static void ApplyListToSourceAsOutputFile(
       const Settings* settings,
       const SubstitutionList& list,
       const SourceFile& source,
       std::vector<OutputFile>* output);
 
   // Like ApplyListToSource but applies the list to all sources and replaces
   // rather than appesnds the output (this produces the complete output).
   static void ApplyListToSources(
       const Settings* settings,
       const SubstitutionList& list,
       const std::vector<SourceFile>& sources,
       std::vector<SourceFile>* output);
+  static void ApplyListToSourcesAsString(
+      const Settings* settings,
+      const SubstitutionList& list,
+      const std::vector<SourceFile>& sources,
+      std::vector<std::string>* output);
   static void ApplyListToSourcesAsOutputFile(
       const Settings* settings,
       const SubstitutionList& list,
       const std::vector<SourceFile>& sources,
       std::vector<OutputFile>* output);
 
   // Given a list of source replacement types used, writes the Ninja variable
   // definitions for the given source file to use for those replacements. The
   // variables will be indented two spaces. Since this is for writing to
   // Ninja files, paths will be relative to the build dir, and no definition
@@ skipping 19 matching lines @@
   // to, otherwise it is ignored.
   static std::string GetSourceSubstitution(
       const Settings* settings,
       const SourceFile& source,
       SubstitutionType type,
       OutputStyle output_style,
       const SourceDir& relative_to);
 };
 
 #endif  // TOOLS_GN_SUBSTITUTION_WRITER_H_