| Index: remoting/host/client_session.cc
|
| diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
|
| index 297ee001eb43a16e4890d9e410ff8fd74ee2c2cc..1aae53c866b9bfe93a67f7e167df99fbd866cc0a 100644
|
| --- a/remoting/host/client_session.cc
|
| +++ b/remoting/host/client_session.cc
|
| @@ -5,7 +5,6 @@
|
| #include "remoting/host/client_session.h"
|
|
|
| #include "base/task.h"
|
| -#include "media/base/callback.h"
|
| #include "remoting/host/user_authenticator.h"
|
| #include "remoting/proto/auth.pb.h"
|
|
|
| @@ -28,7 +27,7 @@ ClientSession::~ClientSession() {
|
|
|
| void ClientSession::SuggestResolution(
|
| const protocol::SuggestResolutionRequest* msg, Task* done) {
|
| - media::AutoTaskRunner done_runner(done);
|
| + base::ScopedTaskRunner done_runner(done);
|
|
|
| if (!authenticated_) {
|
| LOG(WARNING) << "Invalid control message received "
|
| @@ -41,7 +40,7 @@ void ClientSession::BeginSessionRequest(
|
| const protocol::LocalLoginCredentials* credentials, Task* done) {
|
| DCHECK(event_handler_);
|
|
|
| - media::AutoTaskRunner done_runner(done);
|
| + base::ScopedTaskRunner done_runner(done);
|
|
|
| bool success = false;
|
| switch (credentials->type()) {
|
| @@ -70,19 +69,17 @@ void ClientSession::OnAuthorizationComplete(bool success) {
|
|
|
| void ClientSession::InjectKeyEvent(const protocol::KeyEvent* event,
|
| Task* done) {
|
| - media::AutoTaskRunner done_runner(done);
|
| + base::ScopedTaskRunner done_runner(done);
|
| if (authenticated_) {
|
| - done_runner.release();
|
| - input_stub_->InjectKeyEvent(event, done);
|
| + input_stub_->InjectKeyEvent(event, done_runner.Release());
|
| }
|
| }
|
|
|
| void ClientSession::InjectMouseEvent(const protocol::MouseEvent* event,
|
| Task* done) {
|
| - media::AutoTaskRunner done_runner(done);
|
| + base::ScopedTaskRunner done_runner(done);
|
| if (authenticated_) {
|
| - done_runner.release();
|
| - input_stub_->InjectMouseEvent(event, done);
|
| + input_stub_->InjectMouseEvent(event, done_runner.Release());
|
| }
|
| }
|
|
|
|
|