Revert 232657 "GN: toolchain threading cleanup"

trunk/src/tools/gn/target.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 "tools/gn/target.h"
 
 #include "base/bind.h"
 #include "tools/gn/config_values_extractors.h"
 #include "tools/gn/scheduler.h"
 
@@ skipping 39 matching lines @@
       // One we haven't seen yet, also apply it to ourselves.
       dest->push_back(all[i]);
       unique_configs->insert(all[i].ptr);
     }
   }
 }
 
 }  // namespace
 
 Target::Target(const Settings* settings, const Label& label)
-    : Item(settings, label),
+    : Item(label),
+      settings_(settings),
       output_type_(UNKNOWN),
       hard_dep_(false),
       external_(false),
       generated_(false),
       generator_function_(NULL) {
 }
 
 Target::~Target() {
 }
 
@@ skipping 76 matching lines @@
   if (output_type_ != GROUP) {
     // Don't pull target info like libraries and configs from dependencies into
     // a group target. When A depends on a group G, the G's dependents will
     // be treated as direct dependencies of A, so this is unnecessary and will
     // actually result in duplicated settings (since settings will also be
     // pulled from G to A in case G has configs directly on it).
     PullDependentTargetInfo(&unique_configs);
   }
 
   // Mark as resolved.
-  if (!settings()->build_settings()->target_resolved_callback().is_null()) {
+  if (!settings_->build_settings()->target_resolved_callback().is_null()) {
     g_scheduler->ScheduleWork(base::Bind(&TargetResolvedThunk,
-        settings()->build_settings()->target_resolved_callback(),
+        settings_->build_settings()->target_resolved_callback(),
         this));
   }
 }
 
 bool Target::HasBeenGenerated() const {
   return generated_;
 }
 
 void Target::SetGenerated(const Token* token) {
   DCHECK(!generated_);
@@ skipping 45 matching lines @@
     // don't need to bother copying to our configs, only forwarding.
     DCHECK(std::find_if(deps_.begin(), deps_.end(),
                         LabelPtrPtrEquals<Target>(from_target)) !=
            deps_.end());
     direct_dependent_configs_.insert(
         direct_dependent_configs_.end(),
         from_target->direct_dependent_configs().begin(),
         from_target->direct_dependent_configs().end());
   }
 }