Refactor and fix feedback

chrome/browser/autofill/autofill_feedback_infobar_delegate.cc

Index: chrome/browser/autofill/autofill_feedback_infobar_delegate.cc
diff --git a/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc b/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc
index 682757c8e83c2027303bcbb4d4eaad5cbf4ec690..261345b6ade12841b98e5c6eab23a2967eaecdca 100644
--- a/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc
+++ b/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc
@@ -7,13 +7,15 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/webui/bug_report_ui.h"
-#include "chrome/browser/userfeedback/proto/extension.pb.h"
+#include "chrome/browser/ui/webui/feedback_ui.h"
+#include "chrome/browser/feedback/proto/extension.pb.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 
+const char kCategoryTagAutofill[] = "Autofill";
+
 AutofillFeedbackInfoBarDelegate::AutofillFeedbackInfoBarDelegate(
     InfoBarTabHelper* infobar_helper,
     const string16& message,
@@ -42,17 +44,10 @@ string16 AutofillFeedbackInfoBarDelegate::GetLinkText() const {
 
 bool AutofillFeedbackInfoBarDelegate::LinkClicked(
     WindowOpenDisposition disposition) {
-#if defined(OS_CHROMEOS)
-  size_t issue_type = userfeedback::ChromeOsData_ChromeOsCategory_AUTOFILL;
-#else
-  size_t issue_type =
-      userfeedback::ChromeBrowserData_ChromeBrowserCategory_AUTOFILL;
-#endif
-
-  browser::ShowHtmlBugReportView(
+  browser::ShowHtmlFeedbackView(
       Browser::GetBrowserForController(
           &owner()->web_contents()->GetController(), NULL),
       feedback_message_,
-      issue_type);
+      std::string(kCategoryTagAutofill));
   return true;
 }