GN threading refactor

tools/gn/ninja_writer.h

Index: tools/gn/ninja_writer.h
diff --git a/tools/gn/ninja_writer.h b/tools/gn/ninja_writer.h
index c2efc9269e44c1f2c9d32d385c98fe0317edccd4..8859f1ad65ec4e7e2c434d097108f87f5283e587 100644
--- a/tools/gn/ninja_writer.h
+++ b/tools/gn/ninja_writer.h
@@ -11,6 +11,7 @@
 
 #include "base/basictypes.h"
 
+class Builder;
 class BuildSettings;
 class Settings;
 class Target;
@@ -18,31 +19,28 @@ class Target;
 class NinjaWriter {
  public:
   // On failure will print an error and will return false.
-  static bool RunAndWriteFiles(const BuildSettings* build_settings);
+  static bool RunAndWriteFiles(const BuildSettings* build_settings,
+                               Builder* builder);
 
   // Writes only the toolchain.ninja files, skipping the root buildfile. The
   // settings for the files written will be added to the vector.
-  //
-  // The skip files will avoid writing "subninja" rules when we're doing a
-  // side-by-side GYP build. .ninja files exactly matching the ones in the set
-  // will be ignored.
   static bool RunAndWriteToolchainFiles(
       const BuildSettings* build_settings,
-      const std::set<std::string>& skip_files,
+      Builder* builder,
       std::vector<const Settings*>* all_settings);
 
  private:
-  NinjaWriter(const BuildSettings* build_settings);
+  NinjaWriter(const BuildSettings* build_settings, Builder* builder);
   ~NinjaWriter();
 
   bool WriteToolchains(
-      const std::set<std::string>& skip_files,
       std::vector<const Settings*>* all_settings,
       std::vector<const Target*>* default_targets);
   bool WriteRootBuildfiles(const std::vector<const Settings*>& all_settings,
                            const std::vector<const Target*>& default_targets);
 
   const BuildSettings* build_settings_;
+  Builder* builder_;
 
   DISALLOW_COPY_AND_ASSIGN(NinjaWriter);
 };