Convert chromeos::EventRewriter to a ui::EventRewriter

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 7f0d1ce491177737cb052ee5f2b6af220e8716f2..2771fdbe3ea8d2fb2c6bf9fc68b5fd5af1544e0d 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -704,12 +704,12 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
 
   // Start the CrOS input device UMA watcher
   DeviceUMA::GetInstance();
-
-  event_rewriter_.reset(new EventRewriter());
 #endif
   keyboard_event_rewriters_.reset(new EventRewriterController());
   keyboard_event_rewriters_->AddEventRewriter(
-      scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()).Pass());
+      scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
+  keyboard_event_rewriters_->AddEventRewriter(
+      scoped_ptr<ui::EventRewriter>(new EventRewriter()));
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately after ChildProcess::WaitForDebugger().
@@ -781,8 +781,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
 
   keyboard_event_rewriters_->Shutdown();
 #if defined(USE_X11)
-  event_rewriter_.reset();
-
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   XInputHierarchyChangedEventListener::GetInstance()->Stop();