Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/event_rewriter_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 "ui/events/event_rewriter.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 66 matching lines @@
 // removal, and sequencing. Consequently EVENT_REWRITE_DISPATCH_ANOTHER is not
 // supported here (calls to NextDispatchEvent() would continue indefinitely).
 class TestConstantEventRewriter : public EventRewriter {
  public:
   TestConstantEventRewriter(EventRewriteStatus status, EventType type)
       : status_(status), type_(type) {
     CHECK_NE(EVENT_REWRITE_DISPATCH_ANOTHER, status);
   }
 
   EventRewriteStatus RewriteEvent(const Event& event,
-                                  scoped_ptr<Event>* rewritten_event)
-      override {
+                                  scoped_ptr<Event>* rewritten_event) override {
     if (status_ == EVENT_REWRITE_REWRITTEN)
       rewritten_event->reset(new TestEvent(type_));
     return status_;
   }
   EventRewriteStatus NextDispatchEvent(const Event& last_event,
                                        scoped_ptr<Event>* new_event) override {
     NOTREACHED();
     return status_;
   }
 
@@ skipping 120 matching lines @@
   s.RemoveEventRewriter(&r3);
 
   // Continue with the state-based rewriting.
   p.AddExpectedEvent(ET_MOUSE_RELEASED);
   p.AddExpectedEvent(ET_KEY_RELEASED);
   s.Send(ET_MOUSE_RELEASED);
   p.CheckAllReceived();
 }
 
 }  // namespace ui