1;2305;0cRevert 86971 - Move media library AutoTaskRunner to base and rename ScopedTaskRunner.

remoting/host/event_executor_linux.cc

 // Copyright (c) 2011 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 "remoting/host/event_executor.h"
 
 #include <X11/Xlib.h>
 #include <X11/XF86keysym.h>
 #include <X11/keysym.h>
 #include <X11/extensions/XTest.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
+#include "media/base/callback.h"
 #include "remoting/proto/internal.pb.h"
 
 namespace remoting {
 
 using protocol::MouseEvent;
 using protocol::KeyEvent;
 
 namespace {
 
 // A class to generate events on Linux.
@@ skipping 243 matching lines @@
     LOG(ERROR) << "Unable to get window attributes";
     return false;
   }
 
   width_ = root_attr.width;
   height_ = root_attr.height;
   return true;
 }
 
 void EventExecutorLinux::InjectKeyEvent(const KeyEvent* event, Task* done) {
-  base::ScopedTaskRunner done_runner(done);
+  media::AutoTaskRunner done_runner(done);
 
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &EventExecutorLinux::InjectKeyEvent,
-                          event, done_runner.Release()));
+                          event, done_runner.release()));
     return;
   }
 
   // TODO(ajwong): This will only work for QWERTY keyboards.
   int keysym = ChromotocolKeycodeToX11Keysym(event->keycode());
 
   if (keysym == -1) {
     LOG(WARNING) << "Ignoring unknown key: " << event->keycode();
     return;
   }
 
   // Translate the keysym into a keycode understandable by the X display.
   int keycode = XKeysymToKeycode(display_, keysym);
   if (keycode == 0) {
     LOG(WARNING) << "Ignoring undefined keysym: " << keysym
                  << " for key: " << event->keycode();
     return;
   }
 
   VLOG(3) << "Got pepper key: " << event->keycode()
           << " sending keysym: " << keysym
           << " to keycode: " << keycode;
   XTestFakeKeyEvent(display_, keycode, event->pressed(), CurrentTime);
   XFlush(display_);
 }
 
 void EventExecutorLinux::InjectMouseEvent(const MouseEvent* event,
                                           Task* done) {
-  base::ScopedTaskRunner done_runner(done);
+  media::AutoTaskRunner done_runner(done);
 
   if (MessageLoop::current() != message_loop_) {
     message_loop_->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &EventExecutorLinux::InjectMouseEvent,
-                          event, done_runner.Release()));
+                          event, done_runner.release()));
     return;
   }
 
   if (event->has_x() && event->has_y()) {
     if (event->x() < 0 || event->y() < 0 ||
         event->x() > width_ || event->y() > height_) {
       // A misbehaving client may send these. Drop events that are out of range.
       // TODO(ajwong): How can we log this sanely? We don't want to DOS the
       // server with a misbehaving client by logging like crazy.
       return;
@@ skipping 31 matching lines @@
 }  // namespace
 
 EventExecutor* EventExecutor::Create(MessageLoop* message_loop,
                                      Capturer* capturer) {
   return new EventExecutorLinux(message_loop, capturer);
 }
 
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::EventExecutorLinux);