Revert of Ozone support for device special cases in keyboard event rewriting.

ui/events/ozone/evdev/event_factory_evdev.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 "ui/events/ozone/evdev/event_factory_evdev.h"
 
 #include "base/bind.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
@@ skipping 132 matching lines @@
   // directly. We cannot assume it is safe to (re-)enter ui::Event dispatch
   // synchronously from the injection point.
   scoped_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
       new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
                                      weak_ptr_factory_.GetWeakPtr()));
   return make_scoped_ptr(
       new InputInjectorEvdev(proxy_dispatcher.Pass(), cursor_));
 }
 
 void EventFactoryEvdev::DispatchKeyEvent(const KeyEventParams& params) {
-  keyboard_.OnKeyChange(params.code, params.down, params.timestamp,
-                        params.device_id);
+  keyboard_.OnKeyChange(params.code, params.down, params.timestamp);
 }
 
 void EventFactoryEvdev::DispatchMouseMoveEvent(
     const MouseMoveEventParams& params) {
   MouseEvent event(ui::ET_MOUSE_MOVED, params.location, params.location,
                    params.timestamp, modifiers_.GetModifierFlags(),
                    /* changed_button_flags */ 0);
   event.set_source_device_id(params.device_id);
   DispatchUiEvent(&event);
 }
@@ skipping 178 matching lines @@
 
   // Hook up device configuration.
   input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
 
   // Scan & monitor devices.
   device_manager_->AddObserver(this);
   device_manager_->ScanDevices(this);
 }
 
 }  // namespace ui