Revert 232657 "GN: toolchain threading cleanup"

trunk/src/tools/gn/target_unittest.cc

Index: trunk/src/tools/gn/target_unittest.cc
===================================================================
--- trunk/src/tools/gn/target_unittest.cc	(revision 232660)
+++ trunk/src/tools/gn/target_unittest.cc	(working copy)
@@ -15,17 +15,16 @@
  public:
   TargetTest()
       : build_settings_(),
-        settings_(&build_settings_, std::string()),
-        toolchain_(&settings_, Label(SourceDir("//tc/"), "tc")) {
-    settings_.set_toolchain_label(toolchain_.label());
+        toolchain_(Label(SourceDir("//tc/"), "tc")),
+        settings_(&build_settings_, &toolchain_, std::string()) {
   }
   virtual ~TargetTest() {
   }
 
  protected:
   BuildSettings build_settings_;
+  Toolchain toolchain_;
   Settings settings_;
-  Toolchain toolchain_;
 };
 
 }  // namespace
@@ -123,15 +122,15 @@
   b.deps().push_back(LabelTargetPair(&c));
 
   // Normal non-inherited config.
-  Config config(&settings_, Label(SourceDir("//foo/"), "config"));
+  Config config(Label(SourceDir("//foo/"), "config"));
   c.configs().push_back(LabelConfigPair(&config));
 
   // All dependent config.
-  Config all(&settings_, Label(SourceDir("//foo/"), "all"));
+  Config all(Label(SourceDir("//foo/"), "all"));
   c.all_dependent_configs().push_back(LabelConfigPair(&all));
 
   // Direct dependent config.
-  Config direct(&settings_, Label(SourceDir("//foo/"), "direct"));
+  Config direct(Label(SourceDir("//foo/"), "direct"));
   c.direct_dependent_configs().push_back(LabelConfigPair(&direct));
 
   c.OnResolved();