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

content/renderer/render_view_impl_android.cc

Index: content/renderer/render_view_impl_android.cc
diff --git a/content/renderer/render_view_impl_android.cc b/content/renderer/render_view_impl_android.cc
index 57d1920f5bd61875b784d0b7887fee517310568b..50b10aa56672186ed97dffeb74168a3a27eb2380 100644
--- a/content/renderer/render_view_impl_android.cc
+++ b/content/renderer/render_view_impl_android.cc
@@ -14,9 +14,12 @@
 namespace content {
 
 // Check content::TopControlsState and cc::TopControlsState are kept in sync.
-COMPILE_ASSERT(int(SHOWN) == int(cc::SHOWN), mismatching_enums);
-COMPILE_ASSERT(int(HIDDEN) == int(cc::HIDDEN), mismatching_enums);
-COMPILE_ASSERT(int(BOTH) == int(cc::BOTH), mismatching_enums);
+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),
+               mismatching_enums);
+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),
+               mismatching_enums);
+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),
+               mismatching_enums);
 
 cc::TopControlsState ContentToCcTopControlsState(
     TopControlsState state) {