GN: Separately track labels and origins for lists of stuff

tools/gn/target_generator.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_TARGET_GENERATOR_H_
 #define TOOLS_GN_TARGET_GENERATOR_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
 
  private:
   void FillDependentConfigs();  // Includes all types of dependent configs.
   void FillData();
   void FillDependencies();  // Includes data dependencies.
   void FillGypFile();
   void FillHardDep();
 
   // Reads configs/deps from the given var name, and uses the given setting on
   // the target to save them.
-  void FillGenericConfigs(const char* var_name,
-                          std::vector<const Config*>& (Target::*accessor)());
-  void FillGenericDeps(const char* var_name,
-                       std::vector<const Target*>& (Target::*accessor)());
+  void FillGenericConfigs(const char* var_name, LabelConfigVector* dest);
+  void FillGenericDeps(const char* var_name, LabelTargetVector* dest);
 
   void FillForwardDependentConfigs();
 
   DISALLOW_COPY_AND_ASSIGN(TargetGenerator);
 };
 
 #endif  // TOOLS_GN_TARGET_GENERATOR_H_