Revert 232657 "GN: toolchain threading cleanup"

trunk/src/tools/gn/target_unittest.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 "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/build_settings.h"
 #include "tools/gn/config.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/target.h"
 #include "tools/gn/toolchain.h"
 
 namespace {
 
 class TargetTest : public testing::Test {
  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
 
 // Tests that depending on a group is like depending directly on the group's
 // deps.
 TEST_F(TargetTest, GroupDeps) {
   // Two low-level targets.
   Target x(&settings_, Label(SourceDir("//component/"), "x"));
   Target y(&settings_, Label(SourceDir("//component/"), "y"));
@@ skipping 77 matching lines @@
   Target a(&settings_, Label(SourceDir("//foo/"), "a"));
   a.set_output_type(Target::EXECUTABLE);
   Target b(&settings_, Label(SourceDir("//foo/"), "b"));
   b.set_output_type(Target::STATIC_LIBRARY);
   Target c(&settings_, Label(SourceDir("//foo/"), "c"));
   c.set_output_type(Target::STATIC_LIBRARY);
   a.deps().push_back(LabelTargetPair(&b));
   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();
   b.OnResolved();
   a.OnResolved();
 
   // B should have gotten both dependent configs from C.
   ASSERT_EQ(2u, b.configs().size());
   EXPECT_EQ(&all, b.configs()[0].ptr);
   EXPECT_EQ(&direct, b.configs()[1].ptr);
@@ skipping 17 matching lines @@
   b_fwd.OnResolved();
   a_fwd.OnResolved();
 
   // A_fwd should now have both configs.
   ASSERT_EQ(2u, a_fwd.configs().size());
   EXPECT_EQ(&all, a_fwd.configs()[0].ptr);
   EXPECT_EQ(&direct, a_fwd.configs()[1].ptr);
   ASSERT_EQ(1u, a_fwd.all_dependent_configs().size());
   EXPECT_EQ(&all, a_fwd.all_dependent_configs()[0].ptr);
 }