Reorganize event mojom files.

components/mus/ws/window_manager_state_unittest.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 "components/mus/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 65 matching lines @@
   ServerWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerStateTest);
 };
 
 WindowManagerStateTest::WindowManagerStateTest()
     : task_runner_(new base::TestSimpleTaskRunner), window_(nullptr) {}
 
 std::unique_ptr<Accelerator> WindowManagerStateTest::CreateAccelerator() {
   mojom::EventMatcherPtr matcher = mus::CreateKeyMatcher(
-      mus::mojom::KeyboardCode::W, mus::mojom::kEventFlagControlDown);
-  matcher->accelerator_phase = mojom::AcceleratorPhase::POST_TARGET;
+      ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
+  matcher->accelerator_phase = ui::mojom::AcceleratorPhase::POST_TARGET;
   uint32_t accelerator_id = 1;
   std::unique_ptr<Accelerator> accelerator(
       new Accelerator(accelerator_id, *matcher));
   return accelerator;
 }
 
 void WindowManagerStateTest::CreateSecondaryTree(
     TestWindowTreeClient** test_client,
     WindowTree** window_tree,
     ServerWindow** server_window) {
@@ skipping 112 matching lines @@
   ServerWindow* target = window();
   DispatchInputEventToWindow(target, true, key, accelerator.get());
   TestChangeTracker* tracker = wm_client()->tracker();
   EXPECT_EQ(1u, tracker->changes()->size());
   EXPECT_EQ("InputEvent window=1,1 event_action=7",
             ChangesToDescription1(*tracker->changes())[0]);
 
   tracker->changes()->clear();
   ui::KeyEvent key2(ui::ET_KEY_PRESSED, ui::VKEY_Y, ui::EF_CONTROL_DOWN);
   mojom::EventMatcherPtr matcher = mus::CreateKeyMatcher(
-      mus::mojom::KeyboardCode::Y, mus::mojom::kEventFlagControlDown);
-  matcher->accelerator_phase = mojom::AcceleratorPhase::POST_TARGET;
+      ui::mojom::KeyboardCode::Y, ui::mojom::kEventFlagControlDown);
+  matcher->accelerator_phase = ui::mojom::AcceleratorPhase::POST_TARGET;
   uint32_t accelerator_id = 2;
   std::unique_ptr<Accelerator> accelerator2(
       new Accelerator(accelerator_id, *matcher));
   DispatchInputEventToWindow(target, true, key2, accelerator2.get());
   EXPECT_TRUE(tracker->changes()->empty());
 
   WindowTree* target_tree = tree();
   WindowTreeTestApi(target_tree).ClearAck();
   state->OnEventAck(target_tree, mojom::EventResult::UNHANDLED);
   EXPECT_EQ(1u, tracker->changes()->size());
@@ skipping 55 matching lines @@
             ChangesToDescription1(*tracker->changes())[0]);
 
   OnEventAckTimeout(window()->id().client_id);
   EXPECT_TRUE(window_manager()->on_accelerator_called());
   EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus