[PATCH 4/11] ozone: evdev: Move EventModifiersEvdev usage to EventFactoryEvdev

ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

 // Copyright 2014 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 <linux/input.h>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_converter_evdev_impl.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 
 namespace ui {
 
 const char kTestDevicePath[] = "/dev/input/test-device";
 
 class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
  public:
   MockEventConverterEvdevImpl(
       int fd,
-      EventModifiersEvdev* modifiers,
       CursorDelegateEvdev* cursor,
       const KeyEventDispatchCallback& key_callback,
       const MouseMoveEventDispatchCallback& mouse_move_callback,
       const MouseButtonEventDispatchCallback& mouse_button_callback)
       : EventConverterEvdevImpl(fd,
                                 base::FilePath(kTestDevicePath),
                                 1,
                                 INPUT_DEVICE_UNKNOWN,
                                 EventDeviceInfo(),
-                                modifiers,
                                 cursor,
                                 key_callback,
                                 mouse_move_callback,
                                 mouse_button_callback) {
     Start();
   }
   ~MockEventConverterEvdevImpl() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventConverterEvdevImpl);
@@ skipping 76 matching lines @@
 
     cursor_.reset(new ui::MockCursorEvdev());
     device_manager_.reset(new ui::MockDeviceManager());
     event_factory_.reset(new ui::TestEventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
         ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
         base::Bind(&EventConverterEvdevImplTest::DispatchEventForTest,
                    base::Unretained(this))));
 
     device_.reset(new ui::MockEventConverterEvdevImpl(
-        events_in_, event_factory_->modifiers(), cursor_.get(),
+        events_in_, cursor_.get(),
         base::Bind(&ui::EventFactoryEvdev::PostKeyEvent,
                    base::Unretained(event_factory_.get())),
         base::Bind(&ui::EventFactoryEvdev::PostMouseMoveEvent,
                    base::Unretained(event_factory_.get())),
         base::Bind(&ui::EventFactoryEvdev::PostMouseButtonEvent,
                    base::Unretained(event_factory_.get()))));
   }
   void TearDown() override {
     device_.reset();
     cursor_.reset();
@@ skipping 338 matching lines @@
       {{0, 0}, EV_KEY, BTN_TOUCH, 1},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
 
       {{0, 0}, EV_KEY, BTN_TOUCH, 0},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
 
   dev->ProcessEvents(mock_kernel_queue, arraysize(mock_kernel_queue));
   EXPECT_EQ(0u, size());
 }