Stop using macros to paste together names for static_asserts.

content/child/assert_matching_enums.cc

Index: content/child/assert_matching_enums.cc
diff --git a/content/child/assert_matching_enums.cc b/content/child/assert_matching_enums.cc
index c211ee1537c4346900201859e428e36dcc6c6356..0e86cb29c343603a07a46a03f72882735602fa9a 100644
--- a/content/child/assert_matching_enums.cc
+++ b/content/child/assert_matching_enums.cc
@@ -15,48 +15,45 @@
 
 namespace content {
 
-#define STATIC_ASSERT_MATCHING_ENUM(expected, actual) \
-  static_assert(int(expected) == int(actual), "mismatching enums: " #expected)
+#define STATIC_ASSERT_ENUM(a, b)                            \
+  static_assert(static_cast<int>(a) == static_cast<int>(b), \
+                "mismatching enums: " #a)
 
 // ScreenOrientationValues
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockDefault,
-    SCREEN_ORIENTATION_VALUES_DEFAULT);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortraitPrimary,
-    SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortraitSecondary,
-    SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscapePrimary,
-    SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscapeSecondary,
-    SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockAny,
-    SCREEN_ORIENTATION_VALUES_ANY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscape,
-    SCREEN_ORIENTATION_VALUES_LANDSCAPE);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortrait,
-    SCREEN_ORIENTATION_VALUES_PORTRAIT);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockNatural,
-    SCREEN_ORIENTATION_VALUES_NATURAL);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockDefault,
+                   SCREEN_ORIENTATION_VALUES_DEFAULT);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockPortraitPrimary,
+                   SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockPortraitSecondary,
+                   SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockLandscapePrimary,
+                   SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockLandscapeSecondary,
+                   SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockAny,
+                   SCREEN_ORIENTATION_VALUES_ANY);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockLandscape,
+                   SCREEN_ORIENTATION_VALUES_LANDSCAPE);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockPortrait,
+                   SCREEN_ORIENTATION_VALUES_PORTRAIT);
+STATIC_ASSERT_ENUM(blink::WebScreenOrientationLockNatural,
+                   SCREEN_ORIENTATION_VALUES_NATURAL);
 
 // SupportsType
-STATIC_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsNotSupported,
-    media::IsNotSupported);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsSupported,
-    media::IsSupported);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::MayBeSupported,
-    media::MayBeSupported);
+STATIC_ASSERT_ENUM(blink::WebMimeRegistry::IsNotSupported,
+                   media::IsNotSupported);
+STATIC_ASSERT_ENUM(blink::WebMimeRegistry::IsSupported, media::IsSupported);
+STATIC_ASSERT_ENUM(blink::WebMimeRegistry::MayBeSupported,
+                   media::MayBeSupported);
 
 // TargetProperty
-STATIC_ASSERT_MATCHING_ENUM(
-    blink::WebCompositorAnimation::TargetPropertyTransform,
-    cc::Animation::TRANSFORM);
-STATIC_ASSERT_MATCHING_ENUM(
-    blink::WebCompositorAnimation::TargetPropertyOpacity,
-    cc::Animation::OPACITY);
-STATIC_ASSERT_MATCHING_ENUM(blink::WebCompositorAnimation::TargetPropertyFilter,
-                            cc::Animation::FILTER);
-STATIC_ASSERT_MATCHING_ENUM(
-    blink::WebCompositorAnimation::TargetPropertyScrollOffset,
-    cc::Animation::SCROLL_OFFSET);
+STATIC_ASSERT_ENUM(blink::WebCompositorAnimation::TargetPropertyTransform,
+                   cc::Animation::TRANSFORM);
+STATIC_ASSERT_ENUM(blink::WebCompositorAnimation::TargetPropertyOpacity,
+                   cc::Animation::OPACITY);
+STATIC_ASSERT_ENUM(blink::WebCompositorAnimation::TargetPropertyFilter,
+                   cc::Animation::FILTER);
+STATIC_ASSERT_ENUM(blink::WebCompositorAnimation::TargetPropertyScrollOffset,
+                   cc::Animation::SCROLL_OFFSET);
 
 } // namespace content