Refactor and fix feedback

chrome/browser/feedback/feedback_data.h

Index: chrome/browser/feedback/feedback_data.h
diff --git a/chrome/browser/bug_report_data.h b/chrome/browser/feedback/feedback_data.h
similarity index 86%
rename from chrome/browser/bug_report_data.h
rename to chrome/browser/feedback/feedback_data.h
index 2b404b2a32ec8773842f04a8d3c02f2cc204977c..fa8cf6c8207ff59187669fd8b8cbf45d92e3db3d 100644
--- a/chrome/browser/bug_report_data.h
+++ b/chrome/browser/feedback/feedback_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BUG_REPORT_DATA_H_
-#define CHROME_BROWSER_BUG_REPORT_DATA_H_
+#ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
+#define CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
 
 #include <string>
 #include <vector>
@@ -17,16 +17,16 @@
 
 class Profile;
 
-class BugReportData {
+class FeedbackData {
  public:
-  BugReportData();
-  ~BugReportData();
+  FeedbackData();
+  ~FeedbackData();
 
   void SendReport();
 
   void UpdateData(Profile* profile,
                   const std::string& target_tab_url,
-                  const int problem_type,
+                  const std::string& category_tag,
                   const std::string& page_url,
                   const std::string& description,
                   ScreenshotDataPtr image
@@ -44,7 +44,7 @@ class BugReportData {
 
   const std::string& target_tab_url() const { return target_tab_url_; }
 
-  int problem_type() const { return problem_type_; }
+  const std::string& category_tag() const { return category_tag_; }
   const std::string& page_url() const { return page_url_; }
   const std::string& description() const { return description_; }
   ScreenshotDataPtr image() const { return image_; }
@@ -63,7 +63,7 @@ class BugReportData {
   // Target tab url.
   std::string target_tab_url_;
 
-  int problem_type_;
+  std::string category_tag_;
   std::string page_url_;
   std::string description_;
   ScreenshotDataPtr image_;
@@ -82,4 +82,4 @@ class BugReportData {
 #endif
 };
 
-#endif  // CHROME_BROWSER_BUG_REPORT_DATA_H_
+#endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_