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

chrome/browser/media/router/media_router_type_converters_unittest.cc

Index: chrome/browser/media/router/media_router_type_converters_unittest.cc
diff --git a/chrome/browser/media/router/media_router_type_converters_unittest.cc b/chrome/browser/media/router/media_router_type_converters_unittest.cc
index aa7f64b3e8d1f5e5b94b064f8d7cfdc63d498b60..d348a41fcb5aa3eee3988c19ee0cede3e753f74b 100644
--- a/chrome/browser/media/router/media_router_type_converters_unittest.cc
+++ b/chrome/browser/media/router/media_router_type_converters_unittest.cc
@@ -20,8 +20,7 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaSink) {
   mojo_sink->sink_id = "sinkId1";
   mojo_sink->name = "Sink 1";
   mojo_sink->description = "description";
-  mojo_sink->icon_type =
-      media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST;
+  mojo_sink->icon_type = media_router::interfaces::MediaSink::IconType::CAST;
 
   MediaSink media_sink = mojo::TypeConverter<
       media_router::MediaSink,
@@ -39,34 +38,34 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaSink) {
 TEST(MediaRouterTypeConvertersTest, ConvertMediaSinkIconType) {
   // Convert from Mojo to Media Router.
   EXPECT_EQ(media_router::MediaSink::CAST,
-      mojo::SinkIconTypeFromMojo(
-          media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST));
+            mojo::SinkIconTypeFromMojo(
+                media_router::interfaces::MediaSink::IconType::CAST));
   EXPECT_EQ(media_router::MediaSink::CAST_AUDIO,
+            mojo::SinkIconTypeFromMojo(
+                media_router::interfaces::MediaSink::IconType::CAST_AUDIO));
+  EXPECT_EQ(
+      media_router::MediaSink::CAST_AUDIO_GROUP,
       mojo::SinkIconTypeFromMojo(
-          media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST_AUDIO));
-  EXPECT_EQ(media_router::MediaSink::CAST_AUDIO_GROUP,
-      mojo::SinkIconTypeFromMojo(
-          media_router::interfaces::MediaSink::
-              IconType::ICON_TYPE_CAST_AUDIO_GROUP));
+          media_router::interfaces::MediaSink::IconType::CAST_AUDIO_GROUP));
   EXPECT_EQ(media_router::MediaSink::GENERIC,
-      mojo::SinkIconTypeFromMojo(
-          media_router::interfaces::MediaSink::IconType::ICON_TYPE_GENERIC));
+            mojo::SinkIconTypeFromMojo(
+                media_router::interfaces::MediaSink::IconType::GENERIC));
   EXPECT_EQ(media_router::MediaSink::HANGOUT,
-      mojo::SinkIconTypeFromMojo(
-          media_router::interfaces::MediaSink::IconType::ICON_TYPE_HANGOUT));
+            mojo::SinkIconTypeFromMojo(
+                media_router::interfaces::MediaSink::IconType::HANGOUT));
 
   // Convert from Media Router to Mojo.
-  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST,
-      mojo::SinkIconTypeToMojo(media_router::MediaSink::CAST));
-  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::ICON_TYPE_CAST_AUDIO,
-      mojo::SinkIconTypeToMojo(media_router::MediaSink::CAST_AUDIO));
-  EXPECT_EQ(media_router::interfaces::MediaSink::
-      IconType::ICON_TYPE_CAST_AUDIO_GROUP,
+  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::CAST,
+            mojo::SinkIconTypeToMojo(media_router::MediaSink::CAST));
+  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::CAST_AUDIO,
+            mojo::SinkIconTypeToMojo(media_router::MediaSink::CAST_AUDIO));
+  EXPECT_EQ(
+      media_router::interfaces::MediaSink::IconType::CAST_AUDIO_GROUP,
       mojo::SinkIconTypeToMojo(media_router::MediaSink::CAST_AUDIO_GROUP));
-  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::ICON_TYPE_GENERIC,
-      mojo::SinkIconTypeToMojo(media_router::MediaSink::GENERIC));
-  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::ICON_TYPE_HANGOUT,
-      mojo::SinkIconTypeToMojo(media_router::MediaSink::HANGOUT));
+  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::GENERIC,
+            mojo::SinkIconTypeToMojo(media_router::MediaSink::GENERIC));
+  EXPECT_EQ(media_router::interfaces::MediaSink::IconType::HANGOUT,
+            mojo::SinkIconTypeToMojo(media_router::MediaSink::HANGOUT));
 }
 
 TEST(MediaRouterTypeConvertersTest, ConvertMediaRoute) {
@@ -117,13 +116,11 @@ TEST(MediaRouterTypeConvertersTest, ConvertIssue) {
   mojoIssue->title = "title";
   mojoIssue->message = "msg";
   mojoIssue->route_id = "routeId";
-  mojoIssue->default_action =
-      interfaces::Issue::ActionType::ACTION_TYPE_LEARN_MORE;
+  mojoIssue->default_action = interfaces::Issue::ActionType::LEARN_MORE;
   mojoIssue->secondary_actions =
       mojo::Array<interfaces::Issue::ActionType>::New(1);
-  mojoIssue->secondary_actions[0] =
-      interfaces::Issue::ActionType::ACTION_TYPE_DISMISS;
-  mojoIssue->severity = interfaces::Issue::Severity::SEVERITY_WARNING;
+  mojoIssue->secondary_actions[0] = interfaces::Issue::ActionType::DISMISS;
+  mojoIssue->severity = interfaces::Issue::Severity::WARNING;
   mojoIssue->is_blocking = true;
   mojoIssue->help_url = "help_url";
 
@@ -161,9 +158,8 @@ TEST(MediaRouterTypeConvertersTest, ConvertIssueWithoutOptionalFields) {
   interfaces::IssuePtr mojoIssue;
   mojoIssue = interfaces::Issue::New();
   mojoIssue->title = "title";
-  mojoIssue->default_action =
-      interfaces::Issue::ActionType::ACTION_TYPE_DISMISS;
-  mojoIssue->severity = interfaces::Issue::Severity::SEVERITY_WARNING;
+  mojoIssue->default_action = interfaces::Issue::ActionType::DISMISS;
+  mojoIssue->severity = interfaces::Issue::Severity::WARNING;
   mojoIssue->is_blocking = true;
 
   Issue expected_issue("title", "", IssueAction(IssueAction::TYPE_DISMISS),