Make TextCombine an enum class.

third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Index: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index 70fe4f80755cbb2c442de8ca6538ee420a8348ac..39c6d7b82eee48a323b18683d5a287b9afd3422f 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -1361,10 +1361,10 @@ template <>
 inline CSSIdentifierValue::CSSIdentifierValue(TextCombine e)
     : CSSValue(kIdentifierClass) {
   switch (e) {
-    case kTextCombineNone:
+    case TextCombine::kNone:
       value_id_ = CSSValueNone;
       break;
-    case kTextCombineAll:
+    case TextCombine::kAll:
       value_id_ = CSSValueAll;
       break;
   }
@@ -1374,16 +1374,16 @@ template <>
 inline TextCombine CSSIdentifierValue::ConvertTo() const {
   switch (value_id_) {
     case CSSValueNone:
-      return kTextCombineNone;
+      return TextCombine::kNone;
     case CSSValueAll:
     case CSSValueHorizontal:  // -webkit-text-combine
-      return kTextCombineAll;
+      return TextCombine::kAll;
     default:
       break;
   }
 
   NOTREACHED();
-  return kTextCombineNone;
+  return TextCombine::kNone;
 }
 
 template <>