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

components/bitmap_uploader/bitmap_uploader.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/bitmap_uploader/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
       format_(BGRA),
       next_resource_id_(1u),
       id_namespace_(0u),
       surface_client_binding_(this) {}
 
 BitmapUploader::~BitmapUploader() {
   MojoGLES2DestroyContext(gles2_context_);
 }
 
 void BitmapUploader::Init(mojo::Shell* shell) {
-  surface_ = window_->RequestSurface(mus::mojom::SURFACE_TYPE_DEFAULT);
+  surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
   surface_->BindToThread();
 
   mojo::ServiceProviderPtr gpu_service_provider;
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:mus");
   shell->ConnectToApplication(std::move(request2),
                               mojo::GetProxy(&gpu_service_provider), nullptr,
                               mojo::CreatePermissiveCapabilityFilter(),
                               base::Bind(&OnGotContentHandlerID));
   ConnectToService(gpu_service_provider.get(), &gpu_service_);
@@ skipping 69 matching lines @@
     const GLuint64 fence_sync = glInsertFenceSyncCHROMIUM();
     glShallowFlushCHROMIUM();
 
     gpu::SyncToken sync_token;
     glGenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
 
     mus::mojom::TransferableResourcePtr resource =
         mus::mojom::TransferableResource::New();
     resource->id = next_resource_id_++;
     resource_to_texture_id_map_[resource->id] = texture_id;
-    resource->format = mus::mojom::RESOURCE_FORMAT_RGBA_8888;
+    resource->format = mus::mojom::ResourceFormat::RGBA_8888;
     resource->filter = GL_LINEAR;
     resource->size = bitmap_size.Clone();
     mus::mojom::MailboxHolderPtr mailbox_holder =
         mus::mojom::MailboxHolder::New();
     mailbox_holder->mailbox = mus::mojom::Mailbox::New();
     for (int i = 0; i < GL_MAILBOX_SIZE_CHROMIUM; ++i)
       mailbox_holder->mailbox->name.push_back(mailbox[i]);
     mailbox_holder->texture_target = GL_TEXTURE_2D;
     mailbox_holder->sync_token =
         mus::mojom::SyncToken::From<gpu::SyncToken>(sync_token);
     resource->mailbox_holder = std::move(mailbox_holder);
     resource->read_lock_fences_enabled = false;
     resource->is_software = false;
     resource->is_overlay_candidate = false;
 
     mus::mojom::QuadPtr quad = mus::mojom::Quad::New();
-    quad->material = mus::mojom::MATERIAL_TEXTURE_CONTENT;
+    quad->material = mus::mojom::Material::TEXTURE_CONTENT;
 
     mojo::RectPtr rect = mojo::Rect::New();
     if (width_ <= bounds.width() && height_ <= bounds.height()) {
       rect->width = width_;
       rect->height = height_;
     } else {
       // The source bitmap is larger than the viewport. Resize it while
       // maintaining the aspect ratio.
       float width_ratio = static_cast<float>(width_) / bounds.width();
       float height_ratio = static_cast<float>(height_) / bounds.height();
@@ skipping 25 matching lines @@
       texture_state->vertex_opacity.push_back(1.f);
     texture_state->y_flipped = false;
 
     frame->resources.push_back(std::move(resource));
     quad->texture_quad_state = std::move(texture_state);
     pass->quads.push_back(std::move(quad));
   }
 
   if (color_ != g_transparent_color) {
     mus::mojom::QuadPtr quad = mus::mojom::Quad::New();
-    quad->material = mus::mojom::MATERIAL_SOLID_COLOR;
+    quad->material = mus::mojom::Material::SOLID_COLOR;
     quad->rect = mojo::Rect::From(bounds);
     quad->opaque_rect = mojo::Rect::New();
     quad->visible_rect = mojo::Rect::From(bounds);
     quad->needs_blending = true;
     quad->shared_quad_state_index = 0u;
 
     mus::mojom::SolidColorQuadStatePtr color_state =
         mus::mojom::SolidColorQuadState::New();
     color_state->color = mus::mojom::Color::New();
     color_state->color->rgba = color_;
@@ skipping 43 matching lines @@
     glWaitSyncTokenCHROMIUM(
         resource->sync_token.To<gpu::SyncToken>().GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     glDeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace bitmap_uploader