Index: remoting/host/remoting_me2me_host.cc |
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc |
index 4bf32f14a54b101511c9f5850c3ef4a39cee33da..bd0f09b3e965a3d67170f698e483661b411133e8 100644 |
--- a/remoting/host/remoting_me2me_host.cc |
+++ b/remoting/host/remoting_me2me_host.cc |
@@ -1447,6 +1447,8 @@ void HostProcess::ShutdownOnNetworkThread() { |
shutdown_watchdog_->SetExitCode(*exit_code_out_); |
shutdown_watchdog_->Arm(); |
+ config_watcher_.reset(); |
+ |
if (policy_watcher_.get()) { |
policy_watcher_->StopWatching( |
base::Bind(&HostProcess::OnPolicyWatcherShutdown, this)); |