Replace PluginThreadTaskRunner with a simpler MainPluginThreadTaskRunner.

remoting/client/plugin/chromoting_instance.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #include <nacl_io/nacl_io.h>
@@ skipping 24 matching lines @@
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/cpp/var_dictionary.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/normalizing_input_filter_cros.h"
 #include "remoting/client/normalizing_input_filter_mac.h"
 #include "remoting/client/plugin/delegating_signal_strategy.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
+#include "remoting/client/plugin/pepper_main_thread_task_runner.h"
 #include "remoting/client/plugin/pepper_mouse_locker.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
 #include "remoting/client/plugin/pepper_video_renderer_2d.h"
 #include "remoting/client/plugin/pepper_video_renderer_3d.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/client/token_fetcher_proxy.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 #include "url/gurl.h"
@@ skipping 75 matching lines @@
 
 PP_Instance g_logging_instance = 0;
 base::LazyInstance<base::Lock>::Leaky g_logging_lock =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
     : pp::Instance(pp_instance),
       initialized_(false),
-      plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
+      plugin_task_runner_(new PepperMainThreadTaskRunner()),
       context_(plugin_task_runner_.get()),
       input_tracker_(&mouse_input_filter_),
       touch_input_scaler_(&input_tracker_),
       key_mapper_(&touch_input_scaler_),
       input_handler_(&input_tracker_),
       cursor_setter_(this),
       empty_cursor_filter_(&cursor_setter_),
       text_input_controller_(this),
       use_async_pin_dialog_(false),
       weak_factory_(this) {
@@ skipping 34 matching lines @@
 ChromotingInstance::~ChromotingInstance() {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   // Disconnect the client.
   Disconnect();
 
   // Unregister this instance so that debug log messages will no longer be sent
   // 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();
 }
 
 bool ChromotingInstance::Init(uint32_t argc,
                               const char* argn[],
                               const char* argv[]) {
   CHECK(!initialized_);
   initialized_ = true;
 
@@ skipping 935 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting