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

mash/system_ui/system_ui.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 "mash/system_ui/system_ui.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
@@ skipping 15 matching lines @@
  public:
   static void Create(mojo::Shell* shell) {
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = new DesktopBackground;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
-            mash::wm::mojom::CONTAINER_USER_BACKGROUND);
+            static_cast<int32_t>(mash::wm::mojom::Container::USER_BACKGROUND));
     mus::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
-        widget, shell, window, mus::mojom::SURFACE_TYPE_DEFAULT);
+        widget, shell, window, mus::mojom::SurfaceType::DEFAULT);
     widget->Init(params);
     widget->Show();
   }
 
  private:
   DesktopBackground() {}
   ~DesktopBackground() override {}
 
   // Overridden from views::View:
   void OnPaint(gfx::Canvas* canvas) override {
@@ skipping 10 matching lines @@
  public:
   static void Create(mojo::Shell* shell) {
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = new Shelf;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
-            mash::wm::mojom::CONTAINER_USER_SHELF);
+            static_cast<int32_t>(mash::wm::mojom::Container::USER_SHELF));
     mus::Window* window =
         views::WindowManagerConnection::Get()->NewWindow(properties);
     params.native_widget = new views::NativeWidgetMus(
-        widget, shell, window, mus::mojom::SURFACE_TYPE_DEFAULT);
+        widget, shell, window, mus::mojom::SurfaceType::DEFAULT);
     widget->Init(params);
     widget->Show();
   }
 
  private:
   Shelf() {}
   ~Shelf() override {}
 
   // Overridden from views::View:
   void OnPaint(gfx::Canvas* canvas) override {
@@ skipping 24 matching lines @@
   Shelf::Create(app->shell());
 }
 
 bool SystemUI::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   return true;
 }
 
 }  // namespace system_ui
 }  // namespace mash