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

This is needed to avoid faux dependencies on media/ creeping in to remoting/ code, and creating linker issues.

BUG=
TEST=Everything works as before.


Review URL: http://codereview.chromium.org/7062013

TBR=wez@chromium.org
Review URL: http://codereview.chromium.org/7062042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86972 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 7 deletions

diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc
index ca7e24a..5659fc5 100644
--- a/remoting/client/rectangle_update_decoder.cc
+++ b/remoting/client/rectangle_update_decoder.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "media/base/callback.h"
 #include "remoting/base/decoder.h"
 #include "remoting/base/decoder_row_based.h"
 #include "remoting/base/decoder_vp8.h"
@@ -14,6 +15,7 @@
 #include "remoting/client/frame_consumer.h"
 #include "remoting/protocol/session_config.h"
 
+using media::AutoTaskRunner;
 using remoting::protocol::ChannelConfig;
 using remoting::protocol::SessionConfig;
 
@@ -82,11 +84,11 @@ void RectangleUpdateDecoder::DecodePacket(const VideoPacket* packet,
                         done));
     return;
   }
-  base::ScopedTaskRunner done_runner(done);
+  AutoTaskRunner done_runner(done);
 
   TraceContext::tracer()->PrintString("Decode Packet called.");
 
-  AllocateFrame(packet, done_runner.Release());
+  AllocateFrame(packet, done_runner.release());
 }
 
 void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
@@ -98,7 +100,7 @@ void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
                         &RectangleUpdateDecoder::AllocateFrame, packet, done));
     return;
   }
-  base::ScopedTaskRunner done_runner(done);
+  AutoTaskRunner done_runner(done);
 
   TraceContext::tracer()->PrintString("AllocateFrame called.");
 
@@ -131,11 +133,11 @@ void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
                              &frame_,
                              NewRunnableMethod(this,
                                  &RectangleUpdateDecoder::ProcessPacketData,
-                                 packet, done_runner.Release()));
+                                 packet, done_runner.release()));
     frame_is_new_ = true;
     return;
   }
-  ProcessPacketData(packet, done_runner.Release());
+  ProcessPacketData(packet, done_runner.release());
 }
 
 void RectangleUpdateDecoder::ProcessPacketData(
@@ -148,7 +150,7 @@ void RectangleUpdateDecoder::ProcessPacketData(
                         done));
     return;
   }
-  base::ScopedTaskRunner done_runner(done);
+  AutoTaskRunner done_runner(done);
 
   if (frame_is_new_) {
     decoder_->Reset();