Fix build with system ICU

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/text/Character.h"
 
 #include "platform/text/ICUError.h"
 #include <unicode/uvernum.h>
 
 #if defined(USING_SYSTEM_ICU) || (U_ICU_VERSION_MAJOR_NUM <= 57)
 #include <unicode/uniset.h>
 #else
 #include <unicode/uchar.h>
 #endif
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace blink {
 
 // ICU 57 or earlier does not have up to date Emoji properties, so we're
 // 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
 
 // The following patterns can be generated from the respective sections of the
 // emoji_data.txt file by using the following Elisp function in Emacs.
 // Known issues:
 // 1) Does not insert the double [[ and ]] at the beginning and end of the
 // pattern.
 // 2) Does not insert \U0000 at the very last codepoint of a pattern.
 //
@@ skipping 190 matching lines @@
          !u_hasBinaryProperty(ch, UCHAR_EMOJI_PRESENTATION);
 }
 
 bool Character::isEmojiEmojiDefault(UChar32 ch) {
   return u_hasBinaryProperty(ch, UCHAR_EMOJI_PRESENTATION);
 }
 
 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 == '*';
 }
 
 bool Character::isRegionalIndicator(UChar32 ch) {
   return (ch >= 0x1F1E6 && ch <= 0x1F1FF);
 }
 
 };  // namespace blink