GN threading refactor

tools/gn/setup.h

 // 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.
 
 #ifndef TOOLS_GN_SETUP_H_
 #define TOOLS_GN_SETUP_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "tools/gn/build_settings.h"
+#include "tools/gn/builder.h"
+#include "tools/gn/loader.h"
 #include "tools/gn/scheduler.h"
 #include "tools/gn/scope.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/token.h"
 #include "tools/gn/toolchain.h"
 
 class CommandLine;
 class InputFile;
 class ParseNode;
 
 extern const char kDotfile_Help[];
 
 // Base class for code shared between Setup and DependentSetup.
 class CommonSetup {
  public:
   virtual ~CommonSetup();
 
   // When true (the default), Run() will check for unresolved dependencies and
   // cycles upon completion. When false, such errors will be ignored.
   void set_check_for_bad_items(bool s) { check_for_bad_items_ = s; }
 
   BuildSettings& build_settings() { return build_settings_; }
+  Builder* builder() { return builder_.get(); }
+  LoaderImpl* loader() { return loader_.get(); }
 
  protected:
   CommonSetup();
   CommonSetup(const CommonSetup& other);
 
   // Performs the two sets of operations to run the generation before and after
   // the message loop is run.
   void RunPreMessageLoop();
   bool RunPostMessageLoop();
 
- protected:
   BuildSettings build_settings_;
+  scoped_refptr<LoaderImpl> loader_;
+  scoped_refptr<Builder> builder_;
 
   bool check_for_bad_items_;
 
  private:
   CommonSetup& operator=(const CommonSetup& other);  // Disallow.
 };
 
 // Helper class to setup the build settings and environment for the various
 // commands to run.
 class Setup : public CommonSetup {
@@ skipping 56 matching lines @@
 // make a dependent setup which clones the state of the main one, make any
 // necessary changes, and then run it.
 //
 // The way to run both at the same time is:
 //   dependent_setup.RunPreMessageLoop();
 //   main_setup.Run();
 //   dependent_setup.RunPostMessageLoop();
 // so that the main setup executes the message loop, but both are run.
 class DependentSetup : public CommonSetup {
  public:
-  DependentSetup(const Setup& main_setup);
+  DependentSetup(Setup& main_setup);
   virtual ~DependentSetup();
 
   // These are the two parts of Run() in the regular setup, not including the
   // call to actually run the message loop.
   void RunPreMessageLoop();
   bool RunPostMessageLoop();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DependentSetup);
 };
 
 #endif  // TOOLS_GN_SETUP_H_