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

remoting/host/event_executor_mac.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 <ApplicationServices/ApplicationServices.h>
 #include <Carbon/Carbon.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/message_loop.h"
 #include "base/task.h"
+#include "media/base/callback.h"
 #include "remoting/host/capturer.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/message_decoder.h"
 
 namespace remoting {
 
 namespace {
 
 using protocol::MouseEvent;
 using protocol::KeyEvent;
@@ skipping 182 matching lines @@
   // 0xF4 - 0xF7
   -1, -1, /* VKEY_ATTN */ -1, /* VKEY_CRSEL */ -1,
   // 0xF8 - 0xFB
   /* VKEY_EXSEL */ -1, /* VKEY_EREOF */ -1, /* VKEY_PLAY */ -1,
   /* VKEY_ZOOM */ -1,
   // 0xFC - 0xFF
   /* VKEY_NONAME */ -1, /* VKEY_PA1 */ -1, /* VKEY_OEM_CLEAR */ -1, -1
 };
 
 void EventExecutorMac::InjectKeyEvent(const KeyEvent* event, Task* done) {
-  base::ScopedTaskRunner done_runner(done);
+  media::AutoTaskRunner done_runner(done);
 
   int key_code = event->keycode();
   if (key_code >= 0 && key_code < 256) {
     int key_sym = kUsVkeyToKeysym[key_code];
     if (key_sym != -1) {
       base::mac::ScopedCFTypeRef<CGEventRef> kbd_event(
           CGEventCreateKeyboardEvent(0, kUsVkeyToKeysym[key_code],
                                      event->pressed()));
       int this_modifier = 0;
       switch (key_sym) {
@@ skipping 15 matching lines @@
       } else if (this_modifier && !event->pressed()) {
         modifiers_ &= ~this_modifier;
       }
       CGEventSetFlags(kbd_event, modifiers_);
       CGEventPost(kCGSessionEventTap, kbd_event);
     }
   }
 }
 
 void EventExecutorMac::InjectMouseEvent(const MouseEvent* event, Task* done) {
-  base::ScopedTaskRunner done_runner(done);
+  media::AutoTaskRunner done_runner(done);
 
   if (event->has_x() && event->has_y()) {
     // TODO(wez): Checking the validity of the MouseEvent should be done in core
     // cross-platform code, not here!
     // TODO(wez): This code assumes that MouseEvent(0,0) (top-left of client view)
     // corresponds to local (0,0) (top-left of primary monitor).  That won't in
     // general be true on multi-monitor systems, though.
     gfx::Size size = capturer_->size_most_recent();
     if (event->x() >= 0 || event->y() >= 0 ||
         event->x() < size.width() || event->y() < size.height()) {
@@ skipping 42 matching lines @@
 }
 
 }  // namespace
 
 EventExecutor* EventExecutor::Create(MessageLoop* message_loop,
                                      Capturer* capturer) {
   return new EventExecutorMac(message_loop, capturer);
 }
 
 }  // namespace remoting