Revert of Revert of Use the new java_cpp_enum rule in content.

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 af08746b18e4151a0c4da9c53120c80d23a6b0f1..89ff842d4834a2c5734f0e86bc3b265d7abe3af4 100644
--- a/content/child/assert_matching_enums.cc
+++ b/content/child/assert_matching_enums.cc
@@ -20,23 +20,23 @@
 
 // ScreenOrientationValues
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockDefault,
-    DEFAULT);
+    SCREEN_ORIENTATION_VALUES_DEFAULT);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortraitPrimary,
-    PORTRAIT_PRIMARY);
+    SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortraitSecondary,
-    PORTRAIT_SECONDARY);
+    SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscapePrimary,
-    LANDSCAPE_PRIMARY);
+    SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscapeSecondary,
-    LANDSCAPE_SECONDARY);
+    SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockAny,
-    ANY);
+    SCREEN_ORIENTATION_VALUES_ANY);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscape,
-    LANDSCAPE);
+    SCREEN_ORIENTATION_VALUES_LANDSCAPE);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortrait,
-    PORTRAIT);
+    SCREEN_ORIENTATION_VALUES_PORTRAIT);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockNatural,
-    NATURAL);
+    SCREEN_ORIENTATION_VALUES_NATURAL);
 
 // SupportsType
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsNotSupported,