Roll src/third_party/googletest/src/ a325ad2db..82febb8ea (47 commits)

https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/a325ad2db5de..82febb8eafc0

This CL also aliases <tr1/tuple> types used by googletest to C++11
<tuple> types, to prepare for gradually transitioning the Chromium
codebase from std::tr1::tuple to std::tuple.

$ git log a325ad2db..82febb8ea --date=short --no-merges --format='%ad %ae %s'
2018-04-05 misterg Merging gMock, 2
2018-04-05 misterg formatting
2018-04-05 misterg And more MCVS warnings
2018-04-05 misterg fixing MCVS warn
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Have to wait for this one
2018-04-05 misterg Merging matchers test
2018-04-05 misterg Merging matchers test
2018-04-04 misterg bad cut/paste
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg More on MSVC warning C4503, decorated name length exceeded
2018-04-04 misterg Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 misterg Fixing build break on MSVC
2018-04-04 misterg merging gmock matchers 1
2018-04-04 fo40225 fix build break on locale windows
2018-04-04 misterg Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-03 misterg Upstreaming, cl 191344765
2018-04-03 misterg merging port, cont. 191443078
2018-04-03 misterg merging, cont - 2
2018-04-03 misterg merging gtest-port.h , 191439094
2018-04-03 misterg merging, just comments format
2018-04-03 misterg testing, merge
2018-04-03 misterg Testing, gtest-port.h merge
2018-04-02 misterg merging gtest-port.h, again - 1
2018-03-29 gennadiycivil Include OSX builds back into PR builds
2018-03-29 gennadiycivil Revert "merging gtest-port 1 of N"
2018-03-29 gennadiycivil Revert "merging gtest-port, 2"
2018-03-29 leissa typo
2018-03-29 misterg merging gtest-port, 2
2018-03-28 leissa provide alternative for DebugBreak()
2018-03-27 misterg merging gtest-port 1 of N
2018-03-26 misterg merges 1
2018-03-26 misterg merges, gtest
2018-03-26 misterg merging gmock-matchers.h 3
2018-03-26 misterg merging gmock-matchers.h 2
2018-03-26 misterg Upstreaming FloatingEq2Matcher,
2018-03-23 misterg Merging gmock-matchers.h -2
2018-03-23 misterg gmock-matchers merging -2
2018-03-22 misterg merging, gmock -1
2018-03-22 misterg reverting gtest_list_tests_unittest.py
2018-03-22 gennadiycivil Update appveyor.yml
2018-03-22 misterg more merges
2018-03-22 misterg more merges
2018-03-21 misterg More merges
2018-03-16 misterg cl 189032107, again
2018-03-16 misterg cl 189032107
2018-03-15 misterg merge, again, IsRecursiveContainer

Created with:
  roll-dep src/third_party/googletest/src

Bug: 829773
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
Change-Id: Ic865698379d3626a5165f81b56104223ad1558d9
Reviewed-on: https://chromium-review.googlesource.com/987696Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548853}

DEPS

@@ -506,7 +506,7 @@ deps = {
   },
 
   'src/third_party/googletest/src':
-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'a325ad2db5deb623eab740527e559b81c0f39d65',
+    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '82febb8eafc0425601b0d46567dc66c7750233ff',
 
   # GNU binutils assembler for x86-32.
   'src/third_party/gnu_binutils': {

media/filters/ffmpeg_glue_unittest.cc

@@ -31,6 +31,7 @@ namespace media {
 class MockProtocol : public FFmpegURLProtocol {
  public:
   MockProtocol() = default;
+  virtual ~MockProtocol() = default;
 
   MOCK_METHOD2(Read, int(int size, uint8_t* data));
   MOCK_METHOD1(GetPosition, bool(int64_t* position_out));

third_party/googletest/BUILD.gn

@@ -14,17 +14,18 @@ config("gtest_config") {
     # In order to allow regex matches in gtest to be shared between Windows
     # and other systems, we tell gtest to always use its internal engine.
     "GTEST_HAS_POSIX_RE=0",
-    "GTEST_LANG_CXX11=1",
 
-    # ::testing::Combine, which is heavily used in Chromium, is gated on
-    # tr1::tuple. Upstream avoids using tr1::tuple on Visual Studio 2017+,
-    # because it causes warnings. We'll take (and ignore) the warnings to keep
-    # our ::testing::Combine.
-    "GTEST_HAS_TR1_TUPLE=1",
+    "GTEST_LANG_CXX11=1",
+    "GTEST_HAS_STD_TUPLE=1",
   ]
 
   # Gtest headers need to be able to find themselves.
-  include_dirs = [ "src/googletest/include" ]
+  include_dirs = [
+    # TODO(crbug.com/829773): Remove this after transitioning off <tr1/tuple>.
+    "custom",
+
+    "src/googletest/include",
+  ]
 
   if (is_win) {
     cflags = [ "/wd4800" ]  # Unused variable warning.
@@ -34,7 +35,8 @@ config("gtest_config") {
 config("gmock_config") {
   # Gmock headers need to be able to find themselves.
   include_dirs = [
-    "custom",
+    # TODO(crbug.com/829773): Add "custom" here after transitioning off
+    #                         <tr1/tuple>.
     "src/googlemock/include",
   ]
 }
@@ -44,6 +46,8 @@ 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_