Enable -Wenum-compare-conditional.

Bug: 1010111
Change-Id: I24ce7f47b50ec202c07adfa6a1c45b4389fdb67c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3018894
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#900903}

ash/wallpaper/wallpaper_view.cc

@@ -221,8 +221,9 @@ std::unique_ptr<views::Widget> CreateWallpaperWidget(
   *out_wallpaper_view = wallpaper_view;
   int animation_type =
       controller->ShouldShowInitialAnimation()
-          ? WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE
+          ? static_cast<int>(
-          : wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
+                WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE)
+          : static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
   aura::Window* wallpaper_window = wallpaper_widget->GetNativeWindow();
   ::wm::SetWindowVisibilityAnimationType(wallpaper_window, animation_type);
 

ash/wm/workspace/backdrop_controller.cc

@@ -549,9 +549,10 @@ void BackdropController::Show() {
     return;
 
   ScopedWindowVisibilityAnimationTypeResetter resetter{
-      backdrop_window_, WindowState::Get(window_having_backdrop_)->CanMaximize()
+      backdrop_window_,
-                            ? WINDOW_VISIBILITY_ANIMATION_TYPE_STEP_END
+      WindowState::Get(window_having_backdrop_)->CanMaximize()
-                            : ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE};
+          ? static_cast<int>(WINDOW_VISIBILITY_ANIMATION_TYPE_STEP_END)
+          : static_cast<int>(::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE)};
   backdrop_->Show();
 }
 

build/config/compiler/BUILD.gn

@@ -1598,6 +1598,8 @@ config("default_warnings") {
         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
         # recognize.
         cflags += [
+          "-Wenum-compare-conditional",
+
           # An ABI compat warning we don't care about, https://crbug.com/1102157
           # TODO(thakis): Push this to the (few) targets that need it,
           # instead of having a global flag.

chrome/browser/ui/omnibox/omnibox_theme.cc

@@ -20,8 +20,8 @@ int GetThemePropertyId(OmniboxPart part, OmniboxPartState state) {
   switch (part) {
     case OmniboxPart::LOCATION_BAR_BACKGROUND:
       return state == OmniboxPartState::HOVERED
-                 ? TP::COLOR_OMNIBOX_BACKGROUND_HOVERED
+                 ? static_cast<int>(TP::COLOR_OMNIBOX_BACKGROUND_HOVERED)
-                 : TP::COLOR_OMNIBOX_BACKGROUND;
+                 : static_cast<int>(TP::COLOR_OMNIBOX_BACKGROUND);
     case OmniboxPart::LOCATION_BAR_SELECTED_KEYWORD:
       return TP::COLOR_OMNIBOX_SELECTED_KEYWORD;
     case OmniboxPart::RESULTS_BACKGROUND:
@@ -40,8 +40,9 @@ int GetThemePropertyId(OmniboxPart part, OmniboxPartState state) {
     case OmniboxPart::LOCATION_BAR_TEXT_DEFAULT:
       return TP::COLOR_OMNIBOX_TEXT;
     case OmniboxPart::RESULTS_TEXT_DEFAULT:
-      return selected ? TP::COLOR_OMNIBOX_RESULTS_TEXT_SELECTED
+      return selected
-                      : TP::COLOR_OMNIBOX_TEXT;
+                 ? static_cast<int>(TP::COLOR_OMNIBOX_RESULTS_TEXT_SELECTED)
+                 : static_cast<int>(TP::COLOR_OMNIBOX_TEXT);
     case OmniboxPart::LOCATION_BAR_TEXT_DIMMED:
       return TP::COLOR_OMNIBOX_TEXT_DIMMED;
     case OmniboxPart::RESULTS_TEXT_DIMMED:

ui/native_theme/native_theme_win.cc

@@ -1524,13 +1524,17 @@ int NativeThemeWin::GetWindowsState(Part part,
     case kInnerSpinButton:
       switch (state) {
         case kDisabled:
-          return extra.inner_spin.spin_up ? UPS_DISABLED : DNS_DISABLED;
+          return extra.inner_spin.spin_up ? static_cast<int>(UPS_DISABLED)
+                                          : static_cast<int>(DNS_DISABLED);
         case kHovered:
-          return extra.inner_spin.spin_up ? UPS_HOT : DNS_HOT;
+          return extra.inner_spin.spin_up ? static_cast<int>(UPS_HOT)
+                                          : static_cast<int>(DNS_HOT);
         case kNormal:
-          return extra.inner_spin.spin_up ? UPS_NORMAL : DNS_NORMAL;
+          return extra.inner_spin.spin_up ? static_cast<int>(UPS_NORMAL)
+                                          : static_cast<int>(DNS_NORMAL);
         case kPressed:
-          return extra.inner_spin.spin_up ? UPS_PRESSED : DNS_PRESSED;
+          return extra.inner_spin.spin_up ? static_cast<int>(UPS_PRESSED)
+                                          : static_cast<int>(DNS_PRESSED);
         case kNumStates:
           NOTREACHED();
           return 0;

ui/ozone/platform/wayland/test/mock_xdg_shell.cc

@@ -24,8 +24,8 @@ void GetXdgSurfaceImpl(wl_client* client,
   auto* surface = GetUserDataAs<MockSurface>(surface_resource);
   if (surface->xdg_surface()) {
     uint32_t xdg_error = implementation == &kMockXdgSurfaceImpl
-                             ? XDG_WM_BASE_ERROR_ROLE
+                             ? static_cast<uint32_t>(XDG_WM_BASE_ERROR_ROLE)
-                             : ZXDG_SHELL_V6_ERROR_ROLE;
+                             : static_cast<uint32_t>(ZXDG_SHELL_V6_ERROR_ROLE);
     wl_resource_post_error(resource, xdg_error, "surface already has a role");
     return;
   }