Fix race condition in utility process clients

chrome/browser/importer/external_process_importer_client.cc

 // Copyright (c) 2011 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/importer/external_process_importer_client.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ skipping 12 matching lines @@
 
 ExternalProcessImporterClient::ExternalProcessImporterClient(
     ExternalProcessImporterHost* importer_host,
     const importer::SourceProfile& source_profile,
     uint16 items,
     InProcessImporterBridge* bridge)
     : total_bookmarks_count_(0),
       total_history_rows_count_(0),
       total_favicons_count_(0),
       process_importer_host_(importer_host),
-      utility_process_host_(NULL),
       source_profile_(source_profile),
       items_(items),
       bridge_(bridge),
       cancelled_(false) {
   bridge_->AddRef();
   process_importer_host_->NotifyImportStarted();
 }
 
 ExternalProcessImporterClient::~ExternalProcessImporterClient() {
   bridge_->Release();
@@ skipping 24 matching lines @@
   CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_id));
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ExternalProcessImporterClient::StartProcessOnIOThread,
                  this,
                  thread_id));
 }
 
 void ExternalProcessImporterClient::StartProcessOnIOThread(
     BrowserThread::ID thread_id) {
-  utility_process_host_ = new UtilityProcessHost(this, thread_id);
+  utility_process_host_ =
+      (new UtilityProcessHost(this, thread_id))->AsWeakPtr();
   utility_process_host_->set_no_sandbox(true);
 
 #if defined(OS_MACOSX)
   base::environment_vector env;
   std::string dylib_path = GetFirefoxDylibPath().value();
   if (!dylib_path.empty())
     env.push_back(std::make_pair("DYLD_FALLBACK_LIBRARY_PATH", dylib_path));
   utility_process_host_->set_env(env);
 #endif
 
@@ skipping 32 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(
             &ExternalProcessImporterClient::CancelImportProcessOnIOThread,
             this));
   }
   Release();
 }
 
 void ExternalProcessImporterClient::OnProcessCrashed(int exit_code) {
-  utility_process_host_ = NULL;
   if (cancelled_)
     return;
 
   process_importer_host_->Cancel();
 }
 
 bool ExternalProcessImporterClient::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExternalProcessImporterClient, message)
@@ skipping 160 matching lines @@
   template_url_vec.reserve(template_urls.size());
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }