googletest: Remove tr1/tuple forwarding hacks.

Bug: 829773
Change-Id: I54489ef9b232a20065d3fe78d884609bb65b4a87
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.win:win_chrome_official;master.tryserver.chromium.linux:linux_chromium_cfi_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/1011411Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550670}

third_party/googletest/BUILD.gn

@@ -23,12 +23,7 @@ config("gtest_config") {
   ]
 
   # Gtest headers need to be able to find themselves.
-  include_dirs = [
-    # TODO(crbug.com/829773): Remove this after transitioning off <tr1/tuple>.
-    "custom",
-
-    "src/googletest/include",
-  ]
+  include_dirs = [ "src/googletest/include" ]
 
   if (is_win) {
     cflags = [ "/wd4800" ]  # Unused variable warning.
@@ -38,8 +33,7 @@ config("gtest_config") {
 config("gmock_config") {
   # Gmock headers need to be able to find themselves.
   include_dirs = [
-    # TODO(crbug.com/829773): Add "custom" here after transitioning off
-    #                         <tr1/tuple>.
+    "custom",
     "src/googlemock/include",
   ]
 }
@@ -49,8 +43,6 @@ config("gmock_config") {
 source_set("gtest") {
   testonly = true
   sources = [
-    # TODO(crbug.com/829773): Remove this after transitioning off <tr1/tuple>.
-    "custom/gmock/internal/custom/gmock-port.h",
     "src/googletest/include/gtest/gtest-death-test.h",
     "src/googletest/include/gtest/gtest-message.h",
     "src/googletest/include/gtest/gtest-param-test.h",

third_party/googletest/custom/gtest/internal/custom/gtest-port.h

-// Copyright 2018 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 THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-#define THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_
-
-// This temporarily forwards tuple and some tuple functions from std::tr1 to
-// std:: to make it possible to migrate from std::tr1.
-//
-// TODO(crbug.com/829773): Remove this file when the transition is complete.
-
-#include <tuple>
-
-namespace std {
-
-namespace tr1 {
-
-using std::get;
-using std::make_tuple;
-using std::tuple;
-
-}  // namespace tr1
-
-}  // namespace std
-
-#endif  // THIRD_PARTY_GOOGLETEST_CUSTOM_GTEST_INTERNAL_CUSTOM_GTEST_PORT_H_