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

components/font_service/font_service_app.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/font_service/font_service_app.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 
 static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
-                  static_cast<uint32_t>(font_service::TYPEFACE_STYLE_NORMAL),
+                  static_cast<uint32_t>(font_service::TypefaceStyle::NORMAL),
               "Skia and font service flags must match");
 static_assert(static_cast<uint32_t>(SkTypeface::kBold) ==
-                  static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD),
+                  static_cast<uint32_t>(font_service::TypefaceStyle::BOLD),
               "Skia and font service flags must match");
 static_assert(static_cast<uint32_t>(SkTypeface::kItalic) ==
-                  static_cast<uint32_t>(font_service::TYPEFACE_STYLE_ITALIC),
+                  static_cast<uint32_t>(font_service::TypefaceStyle::ITALIC),
               "Skia and font service flags must match");
 static_assert(
     static_cast<uint32_t>(SkTypeface::kBoldItalic) ==
-        static_cast<uint32_t>(font_service::TYPEFACE_STYLE_BOLD_ITALIC),
+        static_cast<uint32_t>(font_service::TypefaceStyle::BOLD_ITALIC),
     "Skia and font service flags must match");
 
 namespace {
 
 mojo::ScopedHandle GetHandleForPath(const base::FilePath& path) {
   if (path.empty())
     return mojo::ScopedHandle();
 
   mojo::ScopedHandle to_pass;
   base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
@@ skipping 43 matching lines @@
   SkFontConfigInterface::FontIdentity result_identity;
   SkString result_family;
   SkTypeface::Style result_style;
   SkFontConfigInterface* fc =
       SkFontConfigInterface::GetSingletonDirectInterface();
   const bool r = fc->matchFamilyName(
       family_name.data(), static_cast<SkTypeface::Style>(requested_style),
       &result_identity, &result_family, &result_style);
 
   if (!r) {
-    callback.Run(nullptr, "", TYPEFACE_STYLE_NORMAL);
+    callback.Run(nullptr, "", TypefaceStyle::NORMAL);
     return;
   }
 
   // Stash away the returned path, so we can give it an ID (index)
   // which will later be given to us in a request to open the file.
   int index = FindOrAddPath(result_identity.fString);
 
   FontIdentityPtr identity(FontIdentity::New());
   identity->id = static_cast<uint32_t>(index);
   identity->ttc_index = result_identity.fTTCIndex;
@@ skipping 17 matching lines @@
   int count = paths_.count();
   for (int i = 0; i < count; ++i) {
     if (path == *paths_[i])
       return i;
   }
   *paths_.append() = new SkString(path);
   return count;
 }
 
 }  // namespace font_service