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

content/child/assert_matching_enums.cc

 // Copyright 2014 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.
 
 // Use this file to assert that *_list.h enums that are meant to do the bridge
 // from Blink are valid.
 
 #include "base/macros.h"
 #include "cc/animation/animation.h"
 #include "content/public/common/screen_orientation_values.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h"
 #include "third_party/WebKit/public/platform/WebMimeRegistry.h"
 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
 
 namespace content {
 
 #define COMPILE_ASSERT_MATCHING_ENUM(expected, actual) \
   COMPILE_ASSERT(int(expected) == int(actual), mismatching_enums)
 
 // 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,
     net::IsNotSupported);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsSupported,
     net::IsSupported);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::MayBeSupported,
     net::MayBeSupported);
 
 // TargetProperty
 COMPILE_ASSERT_MATCHING_ENUM(
     blink::WebCompositorAnimation::TargetPropertyTransform,
     cc::Animation::Transform);
 COMPILE_ASSERT_MATCHING_ENUM(
     blink::WebCompositorAnimation::TargetPropertyOpacity,
     cc::Animation::Opacity);
 COMPILE_ASSERT_MATCHING_ENUM(
     blink::WebCompositorAnimation::TargetPropertyFilter,
     cc::Animation::Filter);
 COMPILE_ASSERT_MATCHING_ENUM(
     blink::WebCompositorAnimation::TargetPropertyScrollOffset,
     cc::Animation::ScrollOffset);
 
 } // namespace content