| Index: remoting/host/remoting_me2me_host.cc
|
| diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
|
| index db4dfc5718e6a383c92b4bca1b2d942a360ee765..f24bbaab4f6252971d1857f5d89d5c4b92fbfff8 100644
|
| --- a/remoting/host/remoting_me2me_host.cc
|
| +++ b/remoting/host/remoting_me2me_host.cc
|
| @@ -143,7 +143,7 @@ class HostProcess
|
|
|
| void ConfigUpdatedDelayed() {
|
| if (LoadConfig()) {
|
| - context_->network_message_loop()->PostTask(
|
| + context_->network_task_runner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&HostProcess::CreateAuthenticatorFactory,
|
| base::Unretained(this)));
|
| @@ -155,21 +155,22 @@ class HostProcess
|
| #if defined(OS_WIN)
|
| class ConfigChangedDelegate : public base::files::FilePathWatcher::Delegate {
|
| public:
|
| - ConfigChangedDelegate(base::MessageLoopProxy* message_loop,
|
| - const base::Closure& callback)
|
| - : message_loop_(message_loop),
|
| + ConfigChangedDelegate(
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| + const base::Closure& callback)
|
| + : task_runner_(task_runner),
|
| callback_(callback) {
|
| }
|
|
|
| void OnFilePathChanged(const FilePath& path) OVERRIDE {
|
| - message_loop_->PostTask(FROM_HERE, callback_);
|
| + task_runner_->PostTask(FROM_HERE, callback_);
|
| }
|
|
|
| void OnFilePathError(const FilePath& path) OVERRIDE {
|
| }
|
|
|
| private:
|
| - scoped_refptr<base::MessageLoopProxy> message_loop_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| base::Closure callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ConfigChangedDelegate);
|
| @@ -212,7 +213,7 @@ class HostProcess
|
| StartWatchingNatPolicy();
|
|
|
| #if defined(OS_MACOSX) || defined(OS_WIN)
|
| - context_->file_message_loop()->PostTask(
|
| + context_->file_task_runner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&HostProcess::ListenForConfigChanges,
|
| base::Unretained(this)));
|
| @@ -240,7 +241,7 @@ class HostProcess
|
| private:
|
| void StartWatchingNatPolicy() {
|
| nat_policy_.reset(
|
| - policy_hack::NatPolicy::Create(context_->file_message_loop()));
|
| + policy_hack::NatPolicy::Create(context_->file_task_runner()));
|
| nat_policy_->StartWatching(
|
| base::Bind(&HostProcess::OnNatPolicyUpdate, base::Unretained(this)));
|
| }
|
| @@ -311,8 +312,8 @@ class HostProcess
|
| }
|
|
|
| void OnNatPolicyUpdate(bool nat_traversal_enabled) {
|
| - if (!context_->network_message_loop()->BelongsToCurrentThread()) {
|
| - context_->network_message_loop()->PostTask(FROM_HERE, base::Bind(
|
| + if (!context_->network_task_runner()->BelongsToCurrentThread()) {
|
| + context_->network_task_runner()->PostTask(FROM_HERE, base::Bind(
|
| &HostProcess::OnNatPolicyUpdate, base::Unretained(this),
|
| nat_traversal_enabled));
|
| return;
|
| @@ -333,7 +334,7 @@ class HostProcess
|
| }
|
|
|
| void StartHost() {
|
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
|
| + DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
| DCHECK(!host_);
|
|
|
| if (!signal_strategy_.get()) {
|
| @@ -421,7 +422,7 @@ class HostProcess
|
| }
|
|
|
| void RestartHost() {
|
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
|
| + DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
| if (restarting_ || shutting_down_)
|
| return;
|
| @@ -432,7 +433,7 @@ class HostProcess
|
| }
|
|
|
| void RestartOnHostShutdown() {
|
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
|
| + DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
| if (shutting_down_)
|
| return;
|
| @@ -447,7 +448,7 @@ class HostProcess
|
| }
|
|
|
| void Shutdown(int exit_code) {
|
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
|
| + DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
| if (shutting_down_)
|
| return;
|
| @@ -459,7 +460,7 @@ class HostProcess
|
| }
|
|
|
| void OnShutdownFinished() {
|
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
|
| + DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
| // Destroy networking objects while we are on the network thread.
|
| host_ = NULL;
|
|
|