Change mojo enums to be scoped enums in the generated C++ bindings.

components/mus/ws/window_finder.cc

 // Copyright 2015 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.
 
 #include "components/mus/ws/window_finder.h"
 
 #include "cc/surfaces/surface_id.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_surface.h"
 #include "components/mus/ws/server_window_surface_manager.h"
 #include "components/mus/ws/window_coordinate_conversions.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/transform.h"
 
 namespace mus {
 namespace ws {
 namespace {
 
 bool IsValidWindowForEvents(ServerWindow* window) {
   ServerWindowSurfaceManager* surface_manager = window->surface_manager();
   return surface_manager &&
-         surface_manager->HasSurfaceOfType(mojom::SURFACE_TYPE_DEFAULT);
+         surface_manager->HasSurfaceOfType(mojom::SurfaceType::DEFAULT);
 }
 
 ServerWindow* FindDeepestVisibleWindowNonSurface(ServerWindow* window,
                                                  gfx::Point* location) {
   const ServerWindow::Windows children(window->GetChildren());
   for (auto iter = children.rbegin(); iter != children.rend(); ++iter) {
     ServerWindow* child = *iter;
     if (!child->visible())
       continue;
 
@@ skipping 71 matching lines @@
   if (target)
     transform.TransformPoint(location);
   return target;
 }
 
 gfx::Transform GetTransformToWindow(cc::SurfaceId display_surface_id,
                                     ServerWindow* window) {
   if (!display_surface_id.is_null()) {
     gfx::Transform transform;
     if (HitTestSurfaceOfType(display_surface_id, window,
-                             mus::mojom::SURFACE_TYPE_DEFAULT, &transform) ||
+                             mus::mojom::SurfaceType::DEFAULT, &transform) ||
         HitTestSurfaceOfType(display_surface_id, window,
-                             mus::mojom::SURFACE_TYPE_UNDERLAY, &transform)) {
+                             mus::mojom::SurfaceType::UNDERLAY, &transform)) {
       return transform;
     }
   }
 
   return GetTransformToWindowNonSurface(window);
 }
 
 }  // namespace ws
 }  // namespace mus