diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc')
| -rw-r--r-- | chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc b/chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc index 39aa55fb4a5..f60e430d589 100644 --- a/chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc +++ b/chromium/third_party/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc @@ -427,7 +427,7 @@ TEST(GeneratedMessageReflectionTest, ReleaseExtensionMessageTest) { TestUtil::ExpectAllExtensionsSet(message); } -#ifdef PROTOBUF_HAS_DEATH_TEST +#ifdef GTEST_HAS_DEATH_TEST TEST(GeneratedMessageReflectionTest, UsageErrors) { unittest::TestAllTypes message; @@ -476,7 +476,7 @@ TEST(GeneratedMessageReflectionTest, UsageErrors) { #undef f } -#endif // PROTOBUF_HAS_DEATH_TEST +#endif // GTEST_HAS_DEATH_TEST } // namespace |