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

mash/wallpaper/wallpaper.cc

 // Copyright 2016 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 "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/application_connection.h"
@@ skipping 40 matching lines @@
     views::WindowManagerConnection::Create(app);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = new Wallpaper;
 
     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, app->shell(), window, mus::mojom::SURFACE_TYPE_DEFAULT);
+        widget, app->shell(), window, mus::mojom::SurfaceType::DEFAULT);
     widget->Init(params);
     widget->Show();
   }
 
   mojo::TracingImpl tracing_;
   scoped_ptr<views::AuraInit> aura_init_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperApplicationDelegate);
 };
 
 }  // namespace
 }  // namespace wallpaper
 }  // namespace mash
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
       new mash::wallpaper::WallpaperApplicationDelegate);
   return runner.Run(shell_handle);
 }