| commit | 30a16cc6398a180c0b69d1f58ddd234c21ea199c | [log] [tgz] |
|---|---|---|
| author | Alan Screen <awscreen@chromium.org> | Wed May 08 20:21:21 2024 +0000 |
| committer | Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed May 08 20:21:21 2024 +0000 |
| tree | acf516a3a91100765ee66c11df89381c7151dec5 | |
| parent | fd032dc515fff664bc3214864bba09364b52b351 [diff] |
Roll third_party/googletest/src/ eff443c6e..fa6de7f43 (18 commits) https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/eff443c6ef5e..fa6de7f4382f Includes a fix in the custom gtest wrapper in response to this upstream change: https://github.com/google/googletest/commit/f1269cc220734a5be8d68b370bf27efe6962bdb2#diff-e0344bd1d4bb73f5a9e74c0ce51a470c7b6344bdb389441411b871623710ce85 This matches the change made to Chromium's roll in https://crrev.com/c/5425151. Created with: roll-dep third_party/googletest/src Change-Id: If6feba4c4e172902c45316e3c02dfcad00673090 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/118772 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/DEPS b/DEPS index ac916b4..d03248e 100644 --- a/DEPS +++ b/DEPS
@@ -113,7 +113,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling gtest # and whatever else without interference from each other. - 'gtest_revision': 'eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7', + 'gtest_revision': 'fa6de7f4382f5c8fb8b9e32eea28a2eb44966c32', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling icu # and whatever else without interference from each other.
diff --git a/third_party/googletest/custom/gtest/internal/custom/gtest_port_wrapper.cc b/third_party/googletest/custom/gtest/internal/custom/gtest_port_wrapper.cc index 6b81e40..44f4fb7 100644 --- a/third_party/googletest/custom/gtest/internal/custom/gtest_port_wrapper.cc +++ b/third_party/googletest/custom/gtest/internal/custom/gtest_port_wrapper.cc
@@ -102,8 +102,6 @@ ::std::string filename_; }; -GTEST_DISABLE_MSC_DEPRECATED_POP_() - static CapturedStream* g_captured_stderr = nullptr; static CapturedStream* g_captured_stdout = nullptr;