Move feedback files into src/components

components/feedback/feedback_uploader.cc

 // 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.
 
-#include "chrome/browser/feedback/feedback_uploader.h"
+#include "components/feedback/feedback_uploader.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/feedback/feedback_report.h"
+#include "components/feedback/feedback_report.h"
 
 namespace feedback {
 namespace {
 
 const char kFeedbackPostUrl[] =
     "https://www.google.com/tools/feedback/chrome/__submit";
 
 const int64 kRetryDelayMinutes = 60;
 
 const base::FilePath::CharType kFeedbackReportPath[] =
     FILE_PATH_LITERAL("Feedback Reports");
 
 }  // namespace
 
 bool FeedbackUploader::ReportsUploadTimeComparator::operator()(
     FeedbackReport* a, FeedbackReport* b) const {
   return a->upload_at() > b->upload_at();
 }
 
 FeedbackUploader::FeedbackUploader(const base::FilePath& path,
                                    base::SequencedWorkerPool* pool)
     : report_path_(path.Append(kFeedbackReportPath)),
       retry_delay_(base::TimeDelta::FromMinutes(kRetryDelayMinutes)),
       url_(kFeedbackPostUrl),
       pool_(pool) {
   dispatch_callback_ = base::Bind(&FeedbackUploader::DispatchReport,
                                   AsWeakPtr());
 }
 
+FeedbackUploader::FeedbackUploader(const base::FilePath& path,
+                                   base::SequencedWorkerPool* pool,
+                                   const std::string& url)
+    : report_path_(path.Append(kFeedbackReportPath)),
+      retry_delay_(base::TimeDelta::FromMinutes(kRetryDelayMinutes)),
+      url_(url),
+      pool_(pool) {
+  dispatch_callback_ = base::Bind(&FeedbackUploader::DispatchReport,

[rkc, 2014/04/28 22:41:32]

Extract common functionality in the constructors to another Init method, call
the Init from both the constructors. It is only one line right now, but this may
later become more.

[achaulk, 2014/04/30 17:12:34]

Done.

+                                  AsWeakPtr());
+}
+
 FeedbackUploader::~FeedbackUploader() {}
 
 void FeedbackUploader::QueueReport(const std::string& data) {
   QueueReportWithDelay(data, base::TimeDelta());
 }
 
 void FeedbackUploader::UpdateUploadTimer() {
   if (reports_queue_.empty())
     return;
 
@@ skipping 34 matching lines @@
 }
 
 void FeedbackUploader::setup_for_test(
     const ReportDataCallback& dispatch_callback,
     const base::TimeDelta& retry_delay) {
   dispatch_callback_ = dispatch_callback;
   retry_delay_ = retry_delay;
 }
 
 }  // namespace feedback