Nukes MessageLoop::Dispatcher (2)

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>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_pump_dispatcher.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/touch_event_converter.h"
 
 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);
 }
 
 }  // namespace
 
 namespace ui {
 
 class MockTouchEventConverterEvdev : public TouchEventConverterEvdev,
-                                     public base::MessageLoop::Dispatcher {
+                                     public base::MessagePumpDispatcher {
  public:
   MockTouchEventConverterEvdev(int a, int b);
   virtual ~MockTouchEventConverterEvdev() {};
 
   void ConfigureReadMock(struct input_event* queue,
                          long read_this_many,
                          long queue_index);
 
   unsigned size() { return dispatched_events_.size(); }
   TouchEvent* event(unsigned index) { return dispatched_events_[index]; }
@@ skipping 342 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());
 }