More refactoring of PluginProcessHost

chrome/browser/plugin_process_host.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/plugin_process_host.h"
 
 #include <windows.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 339 matching lines @@
   virtual void Run() {
     DestroyWindow(window_);
     TRACK_HWND_DESTRUCTION(window_);
   }
 
  private:
   HWND window_;
 };
 
 
-PluginProcessHost::PluginProcessHost(PluginService* plugin_service)
-    : opening_channel_(false),
-      resource_dispatcher_host_(plugin_service->resource_dispatcher_host()),
-      ALLOW_THIS_IN_INITIALIZER_LIST(resolve_proxy_msg_helper_(this, NULL)),
-      plugin_service_(plugin_service) {
-  DCHECK(resource_dispatcher_host_);
-  set_type(PLUGIN_PROCESS);
+PluginProcessHost::PluginProcessHost()
+    : ChildProcessInfo(PLUGIN_PROCESS),
+      opening_channel_(false),
+      ALLOW_THIS_IN_INITIALIZER_LIST(resolve_proxy_msg_helper_(this, NULL)) {
 }
 
 PluginProcessHost::~PluginProcessHost() {
   if (process().handle()) {
     watcher_.StopWatching();
     ProcessWatcher::EnsureProcessTerminated(process().handle());
   }
 }
 
 bool PluginProcessHost::Init(const WebPluginInfo& info,
@@ skipping 62 matching lines @@
   }
 
   if (!locale.empty()) {
     // Pass on the locale so the null plugin will use the right language in the
     // prompt to install the desired plugin.
     cmd_line.AppendSwitchWithValue(switches::kLang, locale);
   }
 
   // Gears requires the data dir to be available on startup.
   std::wstring data_dir =
-      plugin_service_->GetChromePluginDataDir().ToWStringHack();
+    PluginService::GetInstance()->GetChromePluginDataDir().ToWStringHack();
   DCHECK(!data_dir.empty());
   cmd_line.AppendSwitchWithValue(switches::kPluginDataDir, data_dir);
 
   cmd_line.AppendSwitchWithValue(switches::kProcessType,
                                  switches::kPluginProcess);
 
   cmd_line.AppendSwitchWithValue(switches::kProcessChannelID,
                                  channel_id_);
 
   cmd_line.AppendSwitchWithValue(switches::kPluginPath,
                                  info.path.ToWStringHack());
 
   bool in_sandbox = !browser_command_line.HasSwitch(switches::kNoSandbox) &&
                     browser_command_line.HasSwitch(switches::kSafePlugins);
 
   bool child_needs_help =
-      DebugFlags::ProcessDebugFlags(&cmd_line, DebugFlags::PLUGIN, in_sandbox);
+      DebugFlags::ProcessDebugFlags(&cmd_line, type(), in_sandbox);
 
   if (in_sandbox) {
     // spawn the child process in the sandbox
     sandbox::BrokerServices* broker_service =
         g_browser_process->broker_services();
 
     sandbox::ResultCode result;
     PROCESS_INFORMATION target = {0};
     sandbox::TargetPolicy* policy = broker_service->CreatePolicy();
 
@@ skipping 63 matching lines @@
 
 // indicates the plugin process has exited
 void PluginProcessHost::OnObjectSignaled(HANDLE object) {
   DCHECK(process().handle());
   DCHECK_EQ(object, process().handle());
 
   bool did_crash = base::DidProcessCrash(object);
 
   if (did_crash) {
     // Report that this plugin crashed.
-    plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-        new PluginNotificationTask(
+    PluginService::GetInstance()->main_message_loop()->PostTask(
+        FROM_HERE, new PluginNotificationTask(
             NotificationType::CHILD_PROCESS_CRASHED, this));
   }
   // Notify in the main loop of the disconnection.
-  plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-      new PluginNotificationTask(
+  PluginService::GetInstance()->main_message_loop()->PostTask(
+      FROM_HERE, new PluginNotificationTask(
           NotificationType::CHILD_PROCESS_HOST_DISCONNECTED, this));
 
   // Cancel all requests for plugin processes.
   // TODO(mpcomplete): use a real process ID when http://b/issue?id=1210062 is
   // fixed.
-  resource_dispatcher_host_->CancelRequestsForProcess(-1);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      CancelRequestsForProcess(-1);
 
-  // This next line will delete this. It should be kept at the end of the
-  // method.
-  plugin_service_->OnPluginProcessExited(this);
+  delete this;
 }
 
 
 void PluginProcessHost::OnMessageReceived(const IPC::Message& msg) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   IPC::Logging* logger = IPC::Logging::current();
   if (msg.type() == IPC_LOGGING_ID) {
     logger->OnReceivedLoggingMessage(msg);
     return;
   }
@@ skipping 37 matching lines @@
 
   for (size_t i = 0; i < pending_requests_.size(); ++i) {
     RequestPluginChannel(pending_requests_[i].renderer_message_filter_.get(),
                          pending_requests_[i].mime_type,
                          pending_requests_[i].reply_msg);
   }
 
   pending_requests_.clear();
 
   // Notify in the main loop of the connection.
-  plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-      new PluginNotificationTask(
+  PluginService::GetInstance()->main_message_loop()->PostTask(
+      FROM_HERE, new PluginNotificationTask(
           NotificationType::CHILD_PROCESS_HOST_CONNECTED, this));
 }
 
 void PluginProcessHost::OnChannelError() {
   opening_channel_ = false;
   for (size_t i = 0; i < pending_requests_.size(); ++i) {
     ReplyToRenderer(pending_requests_[i].renderer_message_filter_.get(),
                     std::wstring(),
                     FilePath(),
                     pending_requests_[i].reply_msg);
   }
 
   pending_requests_.clear();
 }
 
 void PluginProcessHost::OpenChannelToPlugin(
     ResourceMessageFilter* renderer_message_filter,
     const std::string& mime_type,
     IPC::Message* reply_msg) {
   // Notify in the main loop of the instantiation.
-  plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-      new PluginNotificationTask(
+  PluginService::GetInstance()->main_message_loop()->PostTask(
+      FROM_HERE, new PluginNotificationTask(
           NotificationType::CHILD_INSTANCE_CREATED, this));
 
   if (opening_channel_) {
     pending_requests_.push_back(
         ChannelRequest(renderer_message_filter, mime_type, reply_msg));
     return;
   }
 
   if (!channel_.get()) {
     // There was an error opening the channel, tell the renderer.
@@ skipping 13 matching lines @@
   // TODO(mpcomplete): we need a "process_id" mostly for a unique identifier.
   // We should decouple the idea of a render_process_host_id from the unique ID
   // in ResourceDispatcherHost.
   int render_process_host_id = -1;
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request.request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
     context = Profile::GetDefaultRequestContext();
 
-  resource_dispatcher_host_->BeginRequest(this,
-                                          process().handle(),
-                                          render_process_host_id,
-                                          MSG_ROUTING_CONTROL,
-                                          request_id,
-                                          request,
-                                          context,
-                                          NULL);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      BeginRequest(this, process().handle(), render_process_host_id,
+                   MSG_ROUTING_CONTROL, request_id, request, context, NULL);
 }
 
 void PluginProcessHost::OnCancelRequest(int request_id) {
   int render_process_host_id = -1;
-  resource_dispatcher_host_->CancelRequest(render_process_host_id,
-                                           request_id, true);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      CancelRequest(render_process_host_id, request_id, true);
 }
 
 void PluginProcessHost::OnDataReceivedACK(int request_id) {
   int render_process_host_id = -1;
-  resource_dispatcher_host_->OnDataReceivedACK(render_process_host_id,
-                                               request_id);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      OnDataReceivedACK(render_process_host_id, request_id);
 }
 
 void PluginProcessHost::OnUploadProgressACK(int request_id) {
   int render_process_host_id = -1;
-  resource_dispatcher_host_->OnUploadProgressACK(render_process_host_id,
-                                                 request_id);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      OnUploadProgressACK(render_process_host_id, request_id);
 }
 
 void PluginProcessHost::OnSyncLoad(
     int request_id,
     const ViewHostMsg_Resource_Request& request,
     IPC::Message* sync_result) {
   int render_process_host_id = -1;
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request.request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
     context = Profile::GetDefaultRequestContext();
 
-  resource_dispatcher_host_->BeginRequest(this,
-                                          process().handle(),
-                                          render_process_host_id,
-                                          MSG_ROUTING_CONTROL,
-                                          request_id,
-                                          request,
-                                          context,
-                                          sync_result);
+  PluginService::GetInstance()->resource_dispatcher_host()->
+      BeginRequest(this, process().handle(), render_process_host_id,
+                   MSG_ROUTING_CONTROL, request_id, request, context,
+                   sync_result);
 }
 
 void PluginProcessHost::OnGetCookies(uint32 request_context,
                                      const GURL& url,
                                      std::string* cookies) {
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
     context = Profile::GetDefaultRequestContext();
@@ skipping 92 matching lines @@
   *plugin_finder_url = kDefaultPluginFinderURL;
 }
 
 void PluginProcessHost::OnPluginShutdownRequest() {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
 
   // If we have pending channel open requests from the renderers, then
   // refuse the shutdown request from the plugin process.
   bool ok_to_shutdown = sent_requests_.empty();
-
-  if (ok_to_shutdown)
-    plugin_service_->OnPluginProcessIsShuttingDown(this);
-
   Send(new PluginProcessMsg_ShutdownResponse(ok_to_shutdown));
 }
 
 void PluginProcessHost::OnPluginMessage(
     const std::vector<uint8>& data) {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
 
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path);
   if (chrome_plugin) {
     void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
     uint32 data_len = static_cast<uint32>(data.size());
     chrome_plugin->functions().on_message(data_ptr, data_len);
   }
 }
 
 void PluginProcessHost::OnCreateWindow(HWND parent, IPC::Message* reply_msg) {
   // Need to create this window on the UI thread.
-  plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-      new CreateWindowTask(info_.path, parent, reply_msg));
+  PluginService::GetInstance()->main_message_loop()->PostTask(
+      FROM_HERE, new CreateWindowTask(info_.path, parent, reply_msg));
 }
 
 void PluginProcessHost::OnDestroyWindow(HWND window) {
-  plugin_service_->main_message_loop()->PostTask(FROM_HERE,
-      new DestroyWindowTask(window));
+  PluginService::GetInstance()->main_message_loop()->PostTask(
+      FROM_HERE, new DestroyWindowTask(window));
 }
 
 void PluginProcessHost::Shutdown() {
-
   Send(new PluginProcessMsg_BrowserShutdown);
 }