Revert 232657 "GN: toolchain threading cleanup"

trunk/src/tools/gn/test_with_scope.h

Index: trunk/src/tools/gn/test_with_scope.h
===================================================================
--- trunk/src/tools/gn/test_with_scope.h	(revision 232660)
+++ trunk/src/tools/gn/test_with_scope.h	(working copy)
@@ -20,13 +20,12 @@
 
   BuildSettings* build_settings() { return &build_settings_; }
   Settings* settings() { return &settings_; }
-  Toolchain* toolchain() { return &toolchain_; }
   Scope* scope() { return &scope_; }
 
  private:
   BuildSettings build_settings_;
+  Toolchain toolchain_;
   Settings settings_;
-  Toolchain toolchain_;
   Scope scope_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWithScope);