Index: remoting/client/plugin/chromoting_instance.cc |
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc |
index 755b46fed33c4c3f2c71f5c9c22f730e4748452a..c775e341daa319667b5891fc814a399ac7b2fc96 100644 |
--- a/remoting/client/plugin/chromoting_instance.cc |
+++ b/remoting/client/plugin/chromoting_instance.cc |
@@ -137,7 +137,7 @@ base::LazyInstance<base::Lock>::Leaky g_logging_lock = |
ChromotingInstance::ChromotingInstance(PP_Instance pp_instance) |
: pp::Instance(pp_instance), |
initialized_(false), |
- plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)), |
+ plugin_task_runner_(new MainPluginThreadTaskRunner()), |
context_(plugin_task_runner_.get()), |
input_tracker_(&mouse_input_filter_), |
touch_input_scaler_(&input_tracker_), |
@@ -192,11 +192,6 @@ ChromotingInstance::~ChromotingInstance() { |
// to it. This will stop all logging in all Chromoting instances. |
UnregisterLoggingInstance(); |
- plugin_task_runner_->Quit(); |
- |
- // Ensure that nothing touches the plugin thread delegate after this point. |
- plugin_task_runner_->DetachAndRunShutdownLoop(); |
- |
// Stopping the context shuts down all chromoting threads. |
context_.Stop(); |
} |