GN: Separately track labels and origins for lists of stuff

tools/gn/ninja_binary_target_writer_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 <sstream>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/ninja_binary_target_writer.h"
 #include "tools/gn/test_with_scope.h"
 
@@ skipping 32 matching lines @@
     std::string out_str = out.str();
 #if defined(OS_WIN)
     std::replace(out_str.begin(), out_str.end(), '\\', '/');
 #endif
     EXPECT_EQ(expected_win, out_str);
   }
 
   // A shared library that depends on the source set.
   Target shlib_target(setup.settings(), Label(SourceDir("//foo/"), "shlib"));
   shlib_target.set_output_type(Target::SHARED_LIBRARY);
-  shlib_target.deps().push_back(&target);
+  shlib_target.deps().push_back(LabelTargetPair(&target));
   shlib_target.OnResolved();
 
   {
     std::ostringstream out;
     NinjaBinaryTargetWriter writer(&shlib_target, out);
     writer.Run();
 
     // TODO(brettw) I think we'll need to worry about backslashes here
     // depending if we're on actual Windows or Linux pretending to be Windows.
     const char expected_win[] =
@@ skipping 14 matching lines @@
         "  lib = shlib.dll\n"
         "  dll = shlib.dll\n"
         "  implibflag = /IMPLIB:shlib.dll.lib\n\n";
     std::string out_str = out.str();
 #if defined(OS_WIN)
     std::replace(out_str.begin(), out_str.end(), '\\', '/');
 #endif
     EXPECT_EQ(expected_win, out_str);
   }
 }