thread.cc race fix take 2

webkit/default_plugin/plugin_impl.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 "webkit/default_plugin/plugin_impl.h"
 
 #include <shellapi.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 21 matching lines @@
       mode_(mode),
       plugin_install_stream_(NULL),
       plugin_installer_state_(PluginInstallerStateUndefined),
       enable_click_(false),
       icon_(NULL),
       bold_font_(NULL),
       regular_font_(NULL),
       underline_font_(NULL),
       tooltip_(NULL),
       activex_installer_(NULL),
+      installation_job_monitor_thread_(new PluginInstallationJobMonitorThread()),

[John Grabowski, 2009/01/27 00:31:25]

Fixed

       plugin_database_handler_(*this),
       plugin_download_url_for_display_(false) {
 }
 
 PluginInstallerImpl::~PluginInstallerImpl() {
-  installation_job_monitor_thread_.Stop();
+  installation_job_monitor_thread_->Stop();
 
   if (bold_font_)
     ::DeleteObject(bold_font_);
 
   if (underline_font_)
     ::DeleteObject(underline_font_);
 
   if (activex_installer_) {
     activex_installer_->Cleanup();
     activex_installer_->Release();
@@ skipping 12 matching lines @@
 
   // The clsid without the {} parentheses.
   std::string raw_activex_clsid;
   if (!ParseInstantiationArguments(mime_type, instance, argc, argn, argv,
                                    &raw_activex_clsid)) {
     DLOG(ERROR) << "Incorrect arguments passed to plugin";
     NOTREACHED();
     return false;
   }
 
-  if (!installation_job_monitor_thread_.Initialize()) {
+  if (!installation_job_monitor_thread_->Initialize()) {
     DLOG(ERROR) << "Failed to initialize plugin install job";
     NOTREACHED();
     return false;
   }
 
   InitializeResources(module_handle);
 
   if (is_activex_) {
     // If the codebase is not from a whitelisted website, we do not allow
     // download.
@@ skipping 237 matching lines @@
 
   if (IsWindow()) {
     ::GetClientRect(parent_window, &parent_rect);
     SetWindowPos(NULL, &parent_rect, SWP_SHOWWINDOW);
     return true;
   }
   // First time in -- no window created by plugin yet.
   ::GetClientRect(parent_window, &parent_rect);
   Create(parent_window, parent_rect, NULL, WS_CHILD | WS_BORDER);
   DCHECK(IsWindow());
-  installation_job_monitor_thread_.set_plugin_window(m_hWnd);
+  installation_job_monitor_thread_->set_plugin_window(m_hWnd);
 
   CreateToolTip();
   UpdateToolTip();
 
   UpdateWindow();
   ShowWindow(SW_SHOW);
 
   return true;
 }
 
@@ skipping 281 matching lines @@
     if (!ShellExecuteEx(&shell_execute_info)) {
       DLOG(WARNING) << "Failed to launch plugin installer "
                     << file_path.c_str() << " Error "
                     << ::GetLastError();
       set_plugin_installer_state(PluginInstallerLaunchFailure);
       DisplayStatus(IDS_DEFAULT_PLUGIN_INSTALLATION_FAILED_MSG);
       NOTREACHED();
     } else {
       DLOG(INFO) << "Successfully launched plugin installer";
       set_plugin_installer_state(PluginInstallerLaunchSuccess);
-      installation_job_monitor_thread_.AssignProcessToJob(
+      installation_job_monitor_thread_->AssignProcessToJob(
           shell_execute_info.hProcess);
       DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
       enable_click_ = true;
       RefreshDisplay();
     }
   }
   return 0;
 }
 
 LRESULT PluginInstallerImpl::OnActiveXInstallResult(UINT message,
@@ skipping 96 matching lines @@
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
     instance_,
     static_cast<NPNVariable>(
         default_plugin::kMissingPluginStatusStart + status),
     NULL);
 }