diff options
Diffstat (limited to 'chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc')
| -rw-r--r-- | chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc b/chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc index 29229b5a7e4..1cd56f1e64e 100644 --- a/chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc +++ b/chromium/third_party/protobuf/src/google/protobuf/reflection_ops_unittest.cc @@ -152,7 +152,7 @@ TEST(ReflectionOpsTest, MergeUnknown) { EXPECT_EQ(2, message1.unknown_fields().field(1).varint()); } -#ifdef PROTOBUF_HAS_DEATH_TEST +#ifdef GTEST_HAS_DEATH_TEST TEST(ReflectionOpsTest, MergeFromSelf) { // Note: Copy is implemented in terms of Merge() so technically the Copy @@ -165,7 +165,7 @@ TEST(ReflectionOpsTest, MergeFromSelf) { "&from"); } -#endif // PROTOBUF_HAS_DEATH_TEST +#endif // GTEST_HAS_DEATH_TEST TEST(ReflectionOpsTest, Clear) { unittest::TestAllTypes message; |