Refactor and fix feedback

chrome/browser/feedback/feedback_util.h

Index: chrome/browser/feedback/feedback_util.h
diff --git a/chrome/browser/bug_report_util.h b/chrome/browser/feedback/feedback_util.h
similarity index 86%
rename from chrome/browser/bug_report_util.h
rename to chrome/browser/feedback/feedback_util.h
index 52376d26a31bde0e69c8e07da36bee54bf191246..05a6072734f455cd78b76ee60974db26c3447adb 100644
--- a/chrome/browser/bug_report_util.h
+++ b/chrome/browser/feedback/feedback_util.h
@@ -2,17 +2,17 @@
 // 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_UTIL_H_
-#define CHROME_BROWSER_BUG_REPORT_UTIL_H_
+#ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_UTIL_H_
+#define CHROME_BROWSER_FEEDBACK_FEEDBACK_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "chrome/browser/feedback/proto/common.pb.h"
+#include "chrome/browser/feedback/proto/extension.pb.h"
+#include "chrome/browser/feedback/proto/math.pb.h"
 #include "chrome/browser/ui/webui/screenshot_source.h"
-#include "chrome/browser/userfeedback/proto/common.pb.h"
-#include "chrome/browser/userfeedback/proto/extension.pb.h"
-#include "chrome/browser/userfeedback/proto/math.pb.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
@@ -27,7 +27,7 @@
 class Profile;
 class TabContents;
 
-class BugReportUtil {
+class FeedbackUtil {
  public:
 
 #if defined(OS_MACOSX)
@@ -63,7 +63,7 @@ class BugReportUtil {
   // Generates bug report data.
   static void SendReport(
       Profile* profile
-      , int problem_type
+      , const std::string& category_tag
       , const std::string& page_url_text
       , const std::string& description
       , ScreenshotDataPtr png_data
@@ -90,7 +90,7 @@ class BugReportUtil {
  private:
   // Add a key value pair to the feedback object
   static void AddFeedbackData(
-      userfeedback::ExternalExtensionSubmit* feedback_data,
+      userfeedback::ExtensionSubmit* feedback_data,
       const std::string& key, const std::string& value);
 
   // Send the feedback report
@@ -101,7 +101,7 @@ class BugReportUtil {
   static bool ValidFeedbackSize(const std::string& content);
 #endif
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(BugReportUtil);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(FeedbackUtil);
 };
 
-#endif  // CHROME_BROWSER_BUG_REPORT_UTIL_H_
+#endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_UTIL_H_