Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / events / ozone / evdev / key_event_converter_evdev_unittest.cc

diff --git a/src/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc b/src/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
index 88ee646..8e8dae4 100644 (file)
--- a/src/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
+++ b/src/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
@@ -4,6 +4,7 @@
 
 #include <linux/input.h>
 
+#include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
@@ -19,21 +20,23 @@ const char kTestDevicePath[] = "/dev/input/test-device";
 class MockKeyEventConverterEvdev : public KeyEventConverterEvdev {
  public:
   MockKeyEventConverterEvdev(int fd, EventModifiersEvdev* modifiers)
-      : KeyEventConverterEvdev(fd,
-                               base::FilePath(kTestDevicePath),
-                               modifiers,
-                               EventDispatchCallback()) {
+      : KeyEventConverterEvdev(
+            fd,
+            base::FilePath(kTestDevicePath),
+            modifiers,
+            base::Bind(&MockKeyEventConverterEvdev::DispatchEventForTest,
+                       base::Unretained(this))) {
     Start();
   }
   virtual ~MockKeyEventConverterEvdev() {};
 
   unsigned size() { return dispatched_events_.size(); }
   KeyEvent* event(unsigned index) {
-    CHECK_GT(dispatched_events_.size(), index);
+    DCHECK_GT(dispatched_events_.size(), index);
     return dispatched_events_[index];
   }
 
-  virtual void DispatchEventToCallback(Event* event) OVERRIDE;
+  void DispatchEventForTest(Event* event);
 
  private:
   ScopedVector<KeyEvent> dispatched_events_;
@@ -41,7 +44,7 @@ class MockKeyEventConverterEvdev : public KeyEventConverterEvdev {
   DISALLOW_COPY_AND_ASSIGN(MockKeyEventConverterEvdev);
 };
 
-void MockKeyEventConverterEvdev::DispatchEventToCallback(Event* event) {
+void MockKeyEventConverterEvdev::DispatchEventForTest(Event* event) {
   dispatched_events_.push_back(new KeyEvent(*static_cast<KeyEvent*>(event)));
 }