Merge "[DevTools] Support UTF16 strings with binary protocol (ip)."
diff --git a/DEPS b/DEPS
index fe823ba..1ea78e9 100644
--- a/DEPS
+++ b/DEPS
@@ -33,7 +33,7 @@
# For writing unittests.
'src/third_party/gtest/gtest':
Var('chromium_git') + '/external/github.com/google/googletest@' +
- 'c091b0469ab4c04ee9411ef770f32360945f4c53',
+ '5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081',
}
hooks = [
diff --git a/encoding/span_test.cc b/encoding/span_test.cc
index 8533746..48ee76d 100644
--- a/encoding/span_test.cc
+++ b/encoding/span_test.cc
@@ -11,7 +11,7 @@
class SpanTest : public ::testing::Test {};
using TestTypes = ::testing::Types<uint8_t, uint16_t>;
-TYPED_TEST_CASE(SpanTest, TestTypes);
+TYPED_TEST_SUITE(SpanTest, TestTypes);
TYPED_TEST(SpanTest, Empty) {
span<TypeParam> empty;
diff --git a/third_party/gtest/BUILD.gn b/third_party/gtest/BUILD.gn
index d11439f..d76f416 100644
--- a/third_party/gtest/BUILD.gn
+++ b/third_party/gtest/BUILD.gn
@@ -14,7 +14,6 @@
visibility = [ ":*" ]
include_dirs = [ "gtest/googletest" ]
ldflags = [ "-pthread" ]
- defines = [ "GUNIT_NO_GOOGLE3=1" ]
}
config("gtest_public_config") {
@@ -26,6 +25,7 @@
testonly = true
sources = [
"gtest/googletest/include/gtest/gtest-death-test.h",
+ "gtest/googletest/include/gtest/gtest-matchers.h",
"gtest/googletest/include/gtest/gtest-message.h",
"gtest/googletest/include/gtest/gtest-param-test.h",
"gtest/googletest/include/gtest/gtest-printers.h",
@@ -41,18 +41,17 @@
"gtest/googletest/include/gtest/internal/gtest-death-test-internal.h",
"gtest/googletest/include/gtest/internal/gtest-filepath.h",
"gtest/googletest/include/gtest/internal/gtest-internal.h",
- "gtest/googletest/include/gtest/internal/gtest-linked_ptr.h",
"gtest/googletest/include/gtest/internal/gtest-param-util-generated.h",
"gtest/googletest/include/gtest/internal/gtest-param-util.h",
"gtest/googletest/include/gtest/internal/gtest-port-arch.h",
"gtest/googletest/include/gtest/internal/gtest-port.h",
"gtest/googletest/include/gtest/internal/gtest-string.h",
- "gtest/googletest/include/gtest/internal/gtest-tuple.h",
"gtest/googletest/include/gtest/internal/gtest-type-util.h",
"gtest/googletest/src/gtest-all.cc",
"gtest/googletest/src/gtest-death-test.cc",
"gtest/googletest/src/gtest-filepath.cc",
"gtest/googletest/src/gtest-internal-inl.h",
+ "gtest/googletest/src/gtest-matchers.cc",
"gtest/googletest/src/gtest-port.cc",
"gtest/googletest/src/gtest-printers.cc",
"gtest/googletest/src/gtest-test-part.cc",
@@ -82,14 +81,14 @@
test("gtest_all_test") {
sources = [
- "gtest/googletest/test/gtest-death-test_test.cc",
- "gtest/googletest/test/gtest-filepath_test.cc",
- "gtest/googletest/test/gtest-linked_ptr_test.cc",
- "gtest/googletest/test/gtest-message_test.cc",
- "gtest/googletest/test/gtest-options_test.cc",
- "gtest/googletest/test/gtest-port_test.cc",
- "gtest/googletest/test/gtest-printers_test.cc",
- "gtest/googletest/test/gtest-test-part_test.cc",
+ "gtest/googletest/test/googletest-death-test-test.cc",
+ "gtest/googletest/test/googletest-filepath-test.cc",
+ "gtest/googletest/test/googletest-message-test.cc",
+ "gtest/googletest/test/googletest-options-test.cc",
+ "gtest/googletest/test/googletest-port-test.cc",
+ "gtest/googletest/test/googletest-printers-test.cc",
+ "gtest/googletest/test/googletest-test-part-test.cc",
+ "gtest/googletest/test/googletest-test2_test.cc",
"gtest/googletest/test/gtest-typed-test2_test.cc",
"gtest/googletest/test/gtest-typed-test_test.cc",
"gtest/googletest/test/gtest-typed-test_test.h",
@@ -122,7 +121,7 @@
test("gtest_listener_test") {
sources = [
- "gtest/googletest/test/gtest-listener_test.cc",
+ "gtest/googletest/test/googletest-listener-test.cc",
]
configs += [ ":gtest_private_config" ]
deps = [
@@ -142,9 +141,9 @@
test("gtest_param_test") {
sources = [
- "gtest/googletest/test/gtest-param-test2_test.cc",
- "gtest/googletest/test/gtest-param-test_test.cc",
- "gtest/googletest/test/gtest-param-test_test.h",
+ "gtest/googletest/test/googletest-param-test2-test.cc",
+ "gtest/googletest/test/googletest-param-test-test.cc",
+ "gtest/googletest/test/googletest-param-test-test.h",
]
configs -= [
"//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
@@ -238,21 +237,22 @@
sources = [
"gtest/googlemock/include/gmock/gmock-actions.h",
"gtest/googlemock/include/gmock/gmock-cardinalities.h",
+ "gtest/googlemock/include/gmock/gmock-function-mocker.h",
"gtest/googlemock/include/gmock/gmock-generated-actions.h",
"gtest/googlemock/include/gmock/gmock-generated-function-mockers.h",
"gtest/googlemock/include/gmock/gmock-generated-matchers.h",
- "gtest/googlemock/include/gmock/gmock-generated-nice-strict.h",
"gtest/googlemock/include/gmock/gmock-matchers.h",
"gtest/googlemock/include/gmock/gmock-more-actions.h",
"gtest/googlemock/include/gmock/gmock-more-matchers.h",
+ "gtest/googlemock/include/gmock/gmock-nice-strict.h",
"gtest/googlemock/include/gmock/gmock-spec-builders.h",
"gtest/googlemock/include/gmock/gmock.h",
"gtest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h",
"gtest/googlemock/include/gmock/internal/custom/gmock-matchers.h",
"gtest/googlemock/include/gmock/internal/custom/gmock-port.h",
- "gtest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h",
"gtest/googlemock/include/gmock/internal/gmock-internal-utils.h",
"gtest/googlemock/include/gmock/internal/gmock-port.h",
+ "gtest/googlemock/include/gmock/internal/gmock-pp.h",
"gtest/googlemock/src/gmock-all.cc",
"gtest/googlemock/src/gmock-cardinalities.cc",
"gtest/googlemock/src/gmock-internal-utils.cc",
@@ -290,13 +290,14 @@
"gtest/googlemock/test/gmock-cardinalities_test.cc",
"gtest/googlemock/test/gmock-generated-actions_test.cc",
"gtest/googlemock/test/gmock-generated-function-mockers_test.cc",
- "gtest/googlemock/test/gmock-generated-internal-utils_test.cc",
"gtest/googlemock/test/gmock-generated-matchers_test.cc",
"gtest/googlemock/test/gmock-internal-utils_test.cc",
"gtest/googlemock/test/gmock-matchers_test.cc",
"gtest/googlemock/test/gmock-more-actions_test.cc",
"gtest/googlemock/test/gmock-nice-strict_test.cc",
"gtest/googlemock/test/gmock-port_test.cc",
+ "gtest/googlemock/test/gmock-pp-string_test.cc",
+ "gtest/googlemock/test/gmock-pp_test.cc",
"gtest/googlemock/test/gmock-spec-builders_test.cc",
"gtest/googlemock/test/gmock_test.cc",
]
