Release resources properly from safe browsing incident reporting service.

chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc

 // Copyright 2014 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/safe_browsing/incident_reporting/incident_reporting_service.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 420 matching lines @@
 }
 
 scoped_ptr<IncidentReportUploader> IncidentReportingService::StartReportUpload(
     const IncidentReportUploader::OnResultCallback& callback,
     const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
     const ClientIncidentReport& report) {
   return IncidentReportUploaderImpl::UploadReport(
              callback, request_context_getter, report).Pass();
 }
 
+bool IncidentReportingService::IsProcessingReport() const {
+  return report_;

[robertshield, 2014/09/11 15:37:22]

can you make this report_ != null, makes it explicit to a casual reader that
report_ isn't a bool.

[grt (UTC plus 2), 2014/09/11 15:50:01]

Done.

+}
+
 IncidentReportingService::ProfileContext*
 IncidentReportingService::GetOrCreateProfileContext(Profile* profile) {
   ProfileContextCollection::iterator it =
       profiles_.insert(ProfileContextCollection::value_type(profile, NULL))
           .first;
   if (!it->second)
     it->second = new ProfileContext();
   return it->second;
 }
 
@@ skipping 222 matching lines @@
 }
 
 bool IncidentReportingService::WaitingForMostRecentDownload() {
   DCHECK(report_);  // Only call this when a report is being assembled.
   // The easy case: not waiting if a download has already been found.
   if (report_->has_download())
     return false;
   // The next easy case: waiting if the finder is operating.
   if (last_download_finder_)
     return true;
-  // The harder case: waiting if a profile has not yet been added.
+  // The harder case: waiting if a non-NULL profile has not yet been added.
   for (ProfileContextCollection::const_iterator scan = profiles_.begin();
        scan != profiles_.end();
        ++scan) {
-    if (!scan->second->added)
+    if (scan->first && !scan->second->added)
       return true;
   }
   // There is no most recent download and there's nothing more to wait for.
   return false;
 }
 
 void IncidentReportingService::CancelDownloadCollection() {
   last_download_finder_.reset();
   last_download_begin_ = base::TimeTicks();
   if (report_)
@@ skipping 259 matching lines @@
       if (!profile->IsOffTheRecord())
         OnProfileDestroyed(profile);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace safe_browsing