evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass

ui/events/ozone/evdev/touch_event_converter_unittest.cc

 // Copyright 2013 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 <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <unistd.h>
 
 #include <vector>
@@ skipping 10 matching lines @@
 
 namespace {
 
 static int SetNonBlocking(int fd) {
   int flags = fcntl(fd, F_GETFL, 0);
   if (flags == -1)
     flags = 0;
   return fcntl(fd, F_SETFL, flags | O_NONBLOCK);
 }
 
-const int kInvalidFileDescriptor = -1;
 const char kTestDevicePath[] = "/dev/input/test-device";
 
 }  // namespace
 
 namespace ui {
 
 class MockTouchEventConverterEvdev : public TouchEventConverterEvdev,
                                      public base::MessagePumpDispatcher {
  public:
   MockTouchEventConverterEvdev(int fd, base::FilePath path);
@@ skipping 61 matching lines @@
 
 }  // namespace ui
 
 // Test fixture.
 class TouchEventConverterEvdevTest : public testing::Test {
  public:
   TouchEventConverterEvdevTest() {}
 
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
+    // Set up pipe to satisfy message pump (unused).
+    int evdev_io[2];
+    if (pipe(evdev_io))
+      PLOG(FATAL) << "failed pipe";
+    events_in_ = evdev_io[0];
+    events_out_ = evdev_io[1];
+
     loop_ = new base::MessageLoopForUI;
     device_ = new ui::MockTouchEventConverterEvdev(
-        kInvalidFileDescriptor, base::FilePath(kTestDevicePath));
+        events_in_, base::FilePath(kTestDevicePath));
     base::MessagePumpOzone::Current()->AddDispatcherForRootWindow(device_);
   }
   virtual void TearDown() OVERRIDE {
     delete device_;
     delete loop_;
   }
 
   ui::MockTouchEventConverterEvdev* device() { return device_; }
 
  private:
   base::MessageLoop* loop_;
   ui::MockTouchEventConverterEvdev* device_;
+
+  int events_out_;
+  int events_in_;
+
   DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdevTest);
 };
 
 // TODO(rjkroege): Test for valid handling of time stamps.
 TEST_F(TouchEventConverterEvdevTest, TouchDown) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   struct input_event mock_kernel_queue[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 684},
     {{0, 0}, EV_ABS, ABS_MT_TOUCH_MAJOR, 3},
@@ skipping 256 matching lines @@
   ev1 = dev->event(8);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ev1->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1->time_stamp());
   EXPECT_EQ(38, ev1->x());
   EXPECT_EQ(102, ev1->y());
   EXPECT_EQ(1, ev1->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev1->force());
   EXPECT_FLOAT_EQ(0.f, ev1->rotation_angle());
 }