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

mash/wm/accelerator_registrar_apptest.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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/mus/public/cpp/event_matcher.h"
@@ skipping 70 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest);
 };
 
 TEST_F(AcceleratorRegistrarTest, AcceleratorRegistrarBasic) {
   AcceleratorRegistrarPtr registrar_first;
   ConnectToRegistrar(&registrar_first);
   TestAcceleratorHandler handler_first(std::move(registrar_first));
   EXPECT_TRUE(handler_first.AttemptToInstallAccelerator(
-      1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_T,
-                               mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+      1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::T,
+                               mus::mojom::kEventFlagShiftDown)));
   // Attempting to add an accelerator with the same accelerator id from the same
   // registrar should fail.
   EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
-      1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                               mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+      1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                               mus::mojom::kEventFlagShiftDown)));
 
   // Attempting to add an accelerator with the same id from a different
   // registrar should be OK.
   AcceleratorRegistrarPtr registrar_second;
   ConnectToRegistrar(&registrar_second);
   TestAcceleratorHandler handler_second(std::move(registrar_second));
   EXPECT_TRUE(handler_second.AttemptToInstallAccelerator(
-      1, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                               mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+      1, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                               mus::mojom::kEventFlagShiftDown)));
 
   // But attempting to add an accelerator with the same matcher should fail.
   EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
-      3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                               mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+      3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                               mus::mojom::kEventFlagShiftDown)));
   EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
-      3, mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                               mus::mojom::EVENT_FLAGS_SHIFT_DOWN)));
+      3, mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                               mus::mojom::kEventFlagShiftDown)));
 }
 
 }  // namespace wm
 }  // namespace mash