Refactor and fix feedback

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 10 matching lines @@
         'common',
         'common_net',
         'debugger',
         'in_memory_url_index_cache_proto',
         'installer_util',
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         # 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',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cld/cld.gyp:cld',
@@ skipping 292 matching lines @@
         'browser/browsing_data_indexed_db_helper.cc',
         'browser/browsing_data_indexed_db_helper.h',
         'browser/browsing_data_local_storage_helper.cc',
         'browser/browsing_data_local_storage_helper.h',
         'browser/browsing_data_quota_helper.cc',
         'browser/browsing_data_quota_helper.h',
         'browser/browsing_data_quota_helper_impl.cc',
         '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/certificate_manager_model.cc',
         'browser/certificate_manager_model.h',
         'browser/certificate_viewer.cc',
         'browser/certificate_viewer.h',
         'browser/character_encoding.cc',
         'browser/character_encoding.h',
         'browser/chrome_benchmarking_message_filter.cc',
         'browser/chrome_benchmarking_message_filter.h',
         'browser/chrome_browser_application_mac.h',
         'browser/chrome_browser_application_mac.mm',
@@ skipping 3330 matching lines @@
         'browser/ui/webui/about_ui.h',
         'browser/ui/webui/active_downloads_ui.cc',
         'browser/ui/webui/active_downloads_ui.h',
         'browser/ui/webui/aura/app_list_ui_delegate.h',
         'browser/ui/webui/aura/app_list_ui.cc',
         'browser/ui/webui/aura/app_list_ui.h',
         'browser/ui/webui/bookmark_all_tabs_dialog.cc',
         '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',
         'browser/ui/webui/certificate_viewer_ui.h',
         'browser/ui/webui/chrome_url_data_manager.cc',
         'browser/ui/webui/chrome_url_data_manager.h',
         'browser/ui/webui/chrome_url_data_manager_backend.cc',
         'browser/ui/webui/chrome_url_data_manager_backend.h',
         'browser/ui/webui/chrome_web_ui.cc',
         'browser/ui/webui/chrome_web_ui.h',
@@ skipping 925 matching lines @@
                   'app/nibs/ExtensionInstalledBubble.xib',
                   'app/nibs/FirstRunBubble.xib',
                   'app/nibs/FirstRunDialog.xib',
                   'app/nibs/FullScreenExitBubble.xib',
                   'app/nibs/GlobalErrorBubble.xib',
                   'app/nibs/HttpAuthLoginSheet.xib',
                   'app/nibs/HungRendererDialog.xib',
                   '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',
                   'app/nibs/SpeechInputBubble.xib',
                   'app/nibs/TaskManager.xib',
                   'app/nibs/Toolbar.xib',
                   'app/nibs/WrenchMenu.xib',
                 ],
               },
               'action_name': 'Process xibs for localization',
@@ skipping 692 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/net/cert_logger.proto', ],
       'variables': {
         'proto_in_dir': 'browser/net',
         'proto_out_dir': 'chrome/browser/net',
       },
       'includes': [ '../build/protoc.gypi', ],
     },
     {
       # 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' ]
     },
     {
       # Protobuf compiler / generator for the safebrowsing reporting
       # protocol buffer.
       'target_name': 'safe_browsing_report_proto',
       'type': 'static_library',
       'sources': [ 'browser/safe_browsing/report.proto' ],
       'variables': {
         'proto_in_dir': 'browser/safe_browsing',
         'proto_out_dir': 'chrome/browser/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
     {
       # Protobuf compiler / generator for the InMemoryURLIndex caching
       # protocol buffer.
       'target_name': 'in_memory_url_index_cache_proto',
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }