Convert chromeos::EventRewriter to a ui::EventRewriter

ui/events/event_rewriter_unittest.cc

Index: ui/events/event_rewriter_unittest.cc
diff --git a/ui/events/event_rewriter_unittest.cc b/ui/events/event_rewriter_unittest.cc
index 11a05c9c1572df48b385276d4ea8e4fd623a8283..8008eea5994981d0a583aff7808014010a1a92c7 100644
--- a/ui/events/event_rewriter_unittest.cc
+++ b/ui/events/event_rewriter_unittest.cc
@@ -83,7 +83,7 @@ class TestConstantEventRewriter : public EventRewriter {
     CHECK_NE(EVENT_REWRITE_DISPATCH_ANOTHER, status);
   }
 
-  virtual EventRewriteStatus RewriteEvent(const Event& event,
+  virtual EventRewriteStatus RewriteEvent(Event* event,
                                           scoped_ptr<Event>* rewritten_event)
       OVERRIDE {
     if (status_ == EVENT_REWRITE_REWRITTEN)
@@ -113,9 +113,25 @@ class TestStateMachineEventRewriter : public EventRewriter {
     rules_.insert(std::pair<RewriteCase, RewriteResult>(
         RewriteCase(from_state, from_type), r));
   }
-  virtual EventRewriteStatus RewriteEvent(const Event& event,
+  virtual EventRewriteStatus RewriteEvent(Event* event,
                                           scoped_ptr<Event>* rewritten_event)
+    OVERRIDE {
+      return Rewrite(*event, rewritten_event);
+    }
+  virtual EventRewriteStatus NextDispatchEvent(const Event& last_event,
+                                               scoped_ptr<Event>* new_event)
       OVERRIDE {
+    EXPECT_TRUE(last_rewritten_event_);
+    const TestEvent* arg_last = static_cast<const TestEvent*>(&last_event);
+    EXPECT_EQ(last_rewritten_event_->unique_id(), arg_last->unique_id());
+    const TestEvent* arg_new = static_cast<const TestEvent*>(new_event->get());
+    EXPECT_FALSE(arg_new && arg_last->unique_id() == arg_new->unique_id());
+    return Rewrite(last_event, new_event);
+  }
+
+ private:
+  EventRewriteStatus Rewrite(const Event& event,
+                             scoped_ptr<Event>* rewritten_event) {
     RewriteRules::iterator find =
         rules_.find(RewriteCase(state_, event.type()));
     if (find == rules_.end())
@@ -130,18 +146,6 @@ class TestStateMachineEventRewriter : public EventRewriter {
     state_ = find->second.state;
     return find->second.status;
   }
-  virtual EventRewriteStatus NextDispatchEvent(const Event& last_event,
-                                               scoped_ptr<Event>* new_event)
-      OVERRIDE {
-    EXPECT_TRUE(last_rewritten_event_);
-    const TestEvent* arg_last = static_cast<const TestEvent*>(&last_event);
-    EXPECT_EQ(last_rewritten_event_->unique_id(), arg_last->unique_id());
-    const TestEvent* arg_new = static_cast<const TestEvent*>(new_event->get());
-    EXPECT_FALSE(arg_new && arg_last->unique_id() == arg_new->unique_id());
-    return RewriteEvent(last_event, new_event);
-  }
-
- private:
   typedef std::pair<int, EventType> RewriteCase;
   struct RewriteResult {
     int state;