Fix build with system ICU

third_party/WebKit/Source/platform/text/CharacterEmoji.cpp

Index: third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
diff --git a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
index 3310ac8b6c58be347f96e92899cb52e5e47b8d1a..e1051bd3733f7379ae5a511c15f5a43163e4d8d1 100644
--- a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
+++ b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
@@ -22,7 +22,7 @@ namespace blink {
 // temporarily uing our own functions again. Compare crbug.com/628333 Other than
 // that: versions before 56 do not have an API for Emoji properties, but
 // Chrome's copy of ICU 56 does.
-#if defined(USING_SYSTEM_ICU) || (U_ICU_VERSION_MAJOR_NUM <= 57)
+#if defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 57)
 // The following UnicodeSet patterns were compiled from
 // http://www.unicode.org/Public/emoji/3.0//emoji-data.txt
 
@@ -233,7 +233,7 @@ bool Character::isEmojiEmojiDefault(UChar32 ch) {
 bool Character::isEmojiModifierBase(UChar32 ch) {
   return u_hasBinaryProperty(ch, UCHAR_EMOJI_MODIFIER_BASE);
 }
-#endif  // defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 56)
+#endif  // defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 57)
 
 bool Character::isEmojiKeycapBase(UChar32 ch) {
   return (ch >= '0' && ch <= '9') || ch == '#' || ch == '*';