Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: ui/events/ozone/evdev/touch_event_converter_unittest.cc

Issue 133233008: evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unbreak events_unittests Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter.cc ('k') | ui/events/ozone/event_converter_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/touch_event_converter_unittest.cc
diff --git a/ui/events/ozone/evdev/touch_event_converter_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_unittest.cc
index 05a1e0cfa9d1fc45fcc00ff32bc14f093018c864..67cd0b106f428369b92d3168ba49808dbf5da972 100644
--- a/ui/events/ozone/evdev/touch_event_converter_unittest.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_unittest.cc
@@ -28,7 +28,6 @@ static int SetNonBlocking(int fd) {
return fcntl(fd, F_SETFL, flags | O_NONBLOCK);
}
-const int kInvalidFileDescriptor = -1;
const char kTestDevicePath[] = "/dev/input/test-device";
} // namespace
@@ -110,9 +109,16 @@ class TouchEventConverterEvdevTest : public testing::Test {
// 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 {
@@ -125,6 +131,10 @@ class TouchEventConverterEvdevTest : public testing::Test {
private:
base::MessageLoop* loop_;
ui::MockTouchEventConverterEvdev* device_;
+
+ int events_out_;
+ int events_in_;
+
DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdevTest);
};
« no previous file with comments | « ui/events/ozone/evdev/touch_event_converter.cc ('k') | ui/events/ozone/event_converter_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698