Refactor and fix feedback

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 76eb0ebcbc5032c74b5bb14cf19782ca950b9070..d99d6be607eb515c06af0664b463942c1a50d4e4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -28,7 +28,7 @@
         # TODO(sync): Make browser not depend on syncapi_core directly.
         'syncapi_core',
         'syncapi_service',
-        'userfeedback_proto',
+        'feedback_proto',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
@@ -345,10 +345,10 @@
         'browser/browsing_data_quota_helper_impl.h',
         'browser/browsing_data_remover.cc',
         'browser/browsing_data_remover.h',
-        'browser/bug_report_data.cc',
-        'browser/bug_report_data.h',
-        'browser/bug_report_util.cc',
-        'browser/bug_report_util.h',
+        'browser/feedback/feedback_data.cc',
+        'browser/feedback/feedback_data.h',
+        'browser/feedback/feedback_util.cc',
+        'browser/feedback/feedback_util.h',
         'browser/cancelable_request.cc',
         'browser/cancelable_request.h',
         'browser/certificate_manager_model.cc',
@@ -3723,8 +3723,8 @@
         'browser/ui/webui/bookmark_all_tabs_dialog.h',
         'browser/ui/webui/bookmarks_ui.cc',
         'browser/ui/webui/bookmarks_ui.h',
-        'browser/ui/webui/bug_report_ui.cc',
-        'browser/ui/webui/bug_report_ui.h',
+        'browser/ui/webui/feedback_ui.cc',
+        'browser/ui/webui/feedback_ui.h',
         'browser/ui/webui/certificate_viewer_webui.cc',
         'browser/ui/webui/certificate_viewer_webui.h',
         'browser/ui/webui/certificate_viewer_ui.cc',
@@ -4668,7 +4668,6 @@
                   'app/nibs/ImportProgressDialog.xib',
                   'app/nibs/InstantOptIn.xib',
                   'app/nibs/MainMenu.xib',
-                  'app/nibs/ReportBug.xib',
                   'app/nibs/SadTab.xib',
                   'app/nibs/SaveAccessoryView.xib',
                   'app/nibs/SearchEngineDialog.xib',
@@ -5378,20 +5377,20 @@
     },
     {
       # Protobuf compiler / generate rule for feedback
-      'target_name': 'userfeedback_proto',
+      'target_name': 'feedback_proto',
       'type': 'static_library',
       'sources': [
-        'browser/userfeedback/proto/annotations.proto',
-        'browser/userfeedback/proto/chrome.proto',
-        'browser/userfeedback/proto/common.proto',
-        'browser/userfeedback/proto/dom.proto',
-        'browser/userfeedback/proto/extension.proto',
-        'browser/userfeedback/proto/math.proto',
-        'browser/userfeedback/proto/web.proto',
+        'browser/feedback/proto/annotations.proto',
+        'browser/feedback/proto/chrome.proto',
+        'browser/feedback/proto/common.proto',
+        'browser/feedback/proto/dom.proto',
+        'browser/feedback/proto/extension.proto',
+        'browser/feedback/proto/math.proto',
+        'browser/feedback/proto/web.proto',
       ],
       'variables': {
-        'proto_in_dir': 'browser/userfeedback/proto',
-        'proto_out_dir': 'chrome/browser/userfeedback/proto',
+        'proto_in_dir': 'browser/feedback/proto',
+        'proto_out_dir': 'chrome/browser/feedback/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },