Move feedback files into src/components

components/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_
+#ifndef COMPONENTS_FEEDBACK_FEEDBACK_UPLOADER_H_
+#define COMPONENTS_FEEDBACK_FEEDBACK_UPLOADER_H_
 
 #include <queue>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 
 namespace feedback {
 
 typedef base::Callback<void(const std::string&)> ReportDataCallback;
 
 class FeedbackReport;
 
 // FeedbackUploader is used to add a feedback report to the queue of reports
 // being uploaded. In case uploading a report fails, it is written to disk and
 // tried again when it's turn comes up next in the queue.
 class FeedbackUploader : public base::SupportsWeakPtr<FeedbackUploader> {
  public:
-  explicit FeedbackUploader(const base::FilePath& path,
-                            base::SequencedWorkerPool* pool);
+  FeedbackUploader(const base::FilePath& path,
+                   base::SequencedWorkerPool* pool);
+  FeedbackUploader(const base::FilePath& path,
+                   base::SequencedWorkerPool* pool,
+                   const std::string& url);
   virtual ~FeedbackUploader();
 
   // Queues a report for uploading.
-  void QueueReport(const std::string& data);
+  virtual void QueueReport(const std::string& data);
 
   base::FilePath GetFeedbackReportsPath() { return report_path_; }
 
+  bool QueueEmpty() const { return reports_queue_.empty(); }
+
  protected:
   friend class FeedbackUploaderTest;
+  friend class FeedbackServiceTest;

[jochen (gone - plz use gerrit), 2014/04/08 07:45:35]

please move the tests into the component as well

[achaulk, 2014/04/09 20:09:22]

Done

On 2014/04/08 07:45:35, jochen wrote:

+
   struct ReportsUploadTimeComparator {
     bool operator()(FeedbackReport* a, FeedbackReport* b) const;
   };
 
   // Dispatches the report to be uploaded.
   virtual void DispatchReport(const std::string& data) = 0;
 
   // Update our timer for uploading the next report.
   void UpdateUploadTimer();
 
@@ skipping 17 matching lines @@
   ReportDataCallback dispatch_callback_;
   base::TimeDelta retry_delay_;
   std::string url_;
   base::SequencedWorkerPool* pool_;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackUploader);
 };
 
 }  // namespace feedback
 
-#endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_UPLOADER_H_
+#endif  // COMPONENTS_FEEDBACK_FEEDBACK_UPLOADER_H_