More accelerator code leanup

ui/wm/core/nested_accelerator_controller_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/wm/core/nested_accelerator_controller.h"
 
 #include "base/bind.h"
 #include "base/event_types.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 86 matching lines @@
       FROM_HERE, base::MessageLoop::current()->QuitClosure());
 }
 
 class MockNestedAcceleratorDelegate : public NestedAcceleratorDelegate {
  public:
   MockNestedAcceleratorDelegate()
       : accelerator_manager_(new ui::AcceleratorManager) {}
   virtual ~MockNestedAcceleratorDelegate() {}
 
   // NestedAcceleratorDelegate:
-  virtual bool ShouldProcessEventNow(const ui::KeyEvent& key_event) OVERRIDE {
-    return true;
-  }
-  virtual bool ProcessEvent(const ui::KeyEvent& key_event) OVERRIDE {
-    const int kModifierMask =
-        (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN);
-    ui::Accelerator accelerator(key_event.key_code(),
-                                key_event.flags() & kModifierMask);
-    if (key_event.type() == ui::ET_KEY_RELEASED)
-      accelerator.set_type(ui::ET_KEY_RELEASED);
-    return accelerator_manager_->Process(accelerator);
+  virtual Result ProcessAccelerator(
+      const ui::Accelerator& accelerator) OVERRIDE {
+    return accelerator_manager_->Process(accelerator) ?
+        RESULT_PROCESSED : RESULT_NOT_PROCESSED;
   }
 
   void Register(const ui::Accelerator& accelerator,
                 ui::AcceleratorTarget* target) {
     accelerator_manager_->Register(
         accelerator, ui::AcceleratorManager::kNormalPriority, target);
   }
 
  private:
   scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
@@ skipping 75 matching lines @@
           &inner_dispatcher);
   aura::client::DispatcherRunLoop run_loop(
       aura::client::GetDispatcherClient(root_window()), NULL);
   run_loop.Run();
   EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
 }  //  namespace test
 }  //  namespace wm