Merge 254314 "Fix race condition in uploading feedback reports."

chrome/browser/feedback/feedback_uploader.h

 // 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.
 
 #ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_H_
 #define CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 27 matching lines @@
 
  private:
   friend class FeedbackUploaderTest;
   struct ReportsUploadTimeComparator {
     bool operator()(FeedbackReport* a, FeedbackReport* b) const;
   };
 
   // Dispatches the report to be uploaded.
   void DispatchReport(const std::string& data);
 
-  // Loads any unsent reports from disk and queues them to be uploaded in
-  // the given browser context.
-  void QueueUnsentReports(content::BrowserContext* context);
-
   // Update our timer for uploading the next report.
   void UpdateUploadTimer();
 
   // Requeue this report with a delay.
   void RetryReport(const std::string& data);
 
   void setup_for_test(const ReportDataCallback& dispatch_callback,
                       const base::TimeDelta& retry_delay);
 
   // Browser context this uploader was created for.
   content::BrowserContext* context_;
   // Timer to upload the next report at.
   base::OneShotTimer<FeedbackUploader> upload_timer_;
   // Priority queue of reports prioritized by the time the report is supposed
   // to be uploaded at.
   std::priority_queue<scoped_refptr<FeedbackReport>,
                       std::vector<scoped_refptr<FeedbackReport> >,
                       ReportsUploadTimeComparator> reports_queue_;
 
   ReportDataCallback dispatch_callback_;
   base::TimeDelta retry_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackUploader);
 };
 
 }  // namespace feedback
 
 #endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_H_