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

chrome/browser/feedback/feedback_uploader.h

Index: chrome/browser/feedback/feedback_uploader.h
===================================================================
--- chrome/browser/feedback/feedback_uploader.h	(revision 254798)
+++ chrome/browser/feedback/feedback_uploader.h	(working copy)
@@ -45,10 +45,6 @@
   // 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();