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

chrome/browser/feedback/feedback_report.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/feedback/feedback_report.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/important_file_writer.h"
 #include "base/guid.h"
@@ skipping 60 matching lines @@
 
 FeedbackReport::~FeedbackReport() {}
 
 void FeedbackReport::DeleteReportOnDisk() {
   reports_task_runner_->PostTask(FROM_HERE, base::Bind(
       base::IgnoreResult(&base::DeleteFile), file_, false));
 }
 
 // static
 void FeedbackReport::LoadReportsAndQueue(
-    content::BrowserContext* context, QueueCallback callback) {
-  base::FilePath reports_path = GetFeedbackReportsPath(context);
-  if (reports_path.empty())
+    const base::FilePath& user_dir, QueueCallback callback) {
+  if (user_dir.empty())
     return;
 
-  base::FileEnumerator enumerator(reports_path,
+  base::FileEnumerator enumerator(user_dir.Append(kFeedbackReportPath),
                                   false,
                                   base::FileEnumerator::FILES,
                                   kFeedbackReportFilenameWildcard);
   for (base::FilePath name = enumerator.Next();
        !name.empty();
        name = enumerator.Next()) {
     std::string data;
     if (ReadFileToString(name, &data))
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE, base::Bind(callback, data));
     base::DeleteFile(name, false);
   }
 }
 
 }  // namespace feedback