Race condition in component_updater::BackgroundDowloader (follow up)

chrome/browser/component_updater/background_downloader_win.cc

 // Copyright 2013 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/component_updater/background_downloader_win.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include <functional>
@@ skipping 507 matching lines @@
   download_metrics.url = url();
   download_metrics.downloader = DownloadMetrics::kBits;
   download_metrics.error = SUCCEEDED(error) ? 0 : error;
   download_metrics.bytes_downloaded = bytes_downloaded;
   download_metrics.bytes_total = bytes_total;
   download_metrics.download_time_ms = download_time.InMilliseconds();
 
   // Clean up stale jobs before invoking the callback.
   CleanupStaleJobs(bits_manager_);
 
+  bits_manager_ = NULL;
+
   Result result;
   result.error = error;
   result.response = response;
   BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&BackgroundDownloader::OnDownloadComplete,
                    base::Unretained(this),
                    is_handled,
                    result,
                    download_metrics));
 
-  bits_manager_ = NULL;
-
   // Once the task is posted to the the UI thread, this object may be deleted
   // by its owner. It is not safe to access members of this object on the
   // FILE thread from this point on. The timer is stopped and all BITS
   // interface pointers have been released.
 }
 
 // Called when the BITS job has been transferred successfully. Completes the
 // BITS job by removing it from the BITS queue and making the download
 // available to the caller.
 void BackgroundDownloader::OnStateTransferred() {
@@ skipping 148 matching lines @@
 }
 
 bool BackgroundDownloader::IsStuck() {
   const base::TimeDelta job_stuck_timeout(
       base::TimeDelta::FromMinutes(kJobStuckTimeoutMin));
   return job_stuck_begin_time_ + job_stuck_timeout < base::Time::Now();
 }
 
 }  // namespace component_updater