Remove "2" suffixes from options2 code.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 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',
@@ skipping 3993 matching lines @@
         'browser/ui/webui/ntp/suggestions_source_discovery.cc',
         'browser/ui/webui/ntp/suggestions_source_discovery.h',
         'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
         'browser/ui/webui/ntp/suggestions_source_top_sites.h',
         'browser/ui/webui/ntp/thumbnail_source.cc',
         'browser/ui/webui/ntp/thumbnail_source.h',
         'browser/ui/webui/omnibox/omnibox_ui.cc',
         'browser/ui/webui/omnibox/omnibox_ui.h',
         'browser/ui/webui/omnibox/omnibox_ui_handler.cc',
         'browser/ui/webui/omnibox/omnibox_ui_handler.h',
-        'browser/ui/webui/options2/advanced_options_utils2.h',
-        'browser/ui/webui/options2/advanced_options_utils2_mac.mm',
-        'browser/ui/webui/options2/advanced_options_utils2_win.cc',
-        'browser/ui/webui/options2/advanced_options_utils2_x11.cc',
-        'browser/ui/webui/options2/autofill_options_handler2.cc',
-        'browser/ui/webui/options2/autofill_options_handler2.h',
-        'browser/ui/webui/options2/browser_options_handler2.cc',
-        'browser/ui/webui/options2/browser_options_handler2.h',
-        'browser/ui/webui/options2/certificate_manager_handler2.cc',
-        'browser/ui/webui/options2/certificate_manager_handler2.h',
-        'browser/ui/webui/options2/chromeos/accounts_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/accounts_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/change_picture_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/cros_language_options_handler2.h',
+        'browser/ui/webui/options2/advanced_options_utils.h',
+        'browser/ui/webui/options2/advanced_options_utils_mac.mm',
+        'browser/ui/webui/options2/advanced_options_utils_win.cc',
+        'browser/ui/webui/options2/advanced_options_utils_x11.cc',
+        'browser/ui/webui/options2/autofill_options_handler.cc',
+        'browser/ui/webui/options2/autofill_options_handler.h',
+        'browser/ui/webui/options2/browser_options_handler.cc',
+        'browser/ui/webui/options2/browser_options_handler.h',
+        'browser/ui/webui/options2/certificate_manager_handler.cc',
+        'browser/ui/webui/options2/certificate_manager_handler.h',
+        'browser/ui/webui/options2/chromeos/accounts_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/accounts_options_handler.h',
+        'browser/ui/webui/options2/chromeos/bluetooth_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/bluetooth_options_handler.h',
+        'browser/ui/webui/options2/chromeos/change_picture_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/change_picture_options_handler.h',
+        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/core_chromeos_options_handler.h',
+        'browser/ui/webui/options2/chromeos/cros_language_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/cros_language_options_handler.h',
         'browser/ui/webui/options2/chromeos/display_options_handler.cc',
         'browser/ui/webui/options2/chromeos/display_options_handler.h',
-        'browser/ui/webui/options2/chromeos/internet_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/internet_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/keyboard_handler2.cc',
-        'browser/ui/webui/options2/chromeos/keyboard_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_chewing_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_chewing_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_hangul_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_hangul_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_mozc_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_mozc_handler2.h',
-        'browser/ui/webui/options2/chromeos/language_options_util2.cc',
-        'browser/ui/webui/options2/chromeos/language_options_util2.h',
-        'browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc',
-        'browser/ui/webui/options2/chromeos/language_pinyin_handler2.h',
-        'browser/ui/webui/options2/chromeos/pointer_handler2.cc',
-        'browser/ui/webui/options2/chromeos/pointer_handler2.h',
-        'browser/ui/webui/options2/chromeos/proxy_handler2.cc',
-        'browser/ui/webui/options2/chromeos/proxy_handler2.h',
-        'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/stats_options_handler2.cc',
-        'browser/ui/webui/options2/chromeos/stats_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/user_image_source2.cc',
-        'browser/ui/webui/options2/chromeos/user_image_source2.h',
-        'browser/ui/webui/options2/chromeos/wallpaper_source2.cc',
-        'browser/ui/webui/options2/chromeos/wallpaper_source2.h',
-        'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc',
-        'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h',
-        'browser/ui/webui/options2/clear_browser_data_handler2.cc',
-        'browser/ui/webui/options2/clear_browser_data_handler2.h',
-        'browser/ui/webui/options2/content_settings_handler2.cc',
-        'browser/ui/webui/options2/content_settings_handler2.h',
-        'browser/ui/webui/options2/cookies_view_handler2.cc',
-        'browser/ui/webui/options2/cookies_view_handler2.h',
-        'browser/ui/webui/options2/core_options_handler2.cc',
-        'browser/ui/webui/options2/core_options_handler2.h',
-        'browser/ui/webui/options2/font_settings_handler2.cc',
-        'browser/ui/webui/options2/font_settings_handler2.h',
-        'browser/ui/webui/options2/font_settings_utils2.h',
-        'browser/ui/webui/options2/font_settings_utils2_mac.mm',
-        'browser/ui/webui/options2/font_settings_utils2_win.cc',
-        'browser/ui/webui/options2/font_settings_utils2_x11.cc',
-        'browser/ui/webui/options2/handler_options_handler2.cc',
-        'browser/ui/webui/options2/handler_options_handler2.h',
-        'browser/ui/webui/options2/home_page_overlay_handler2.cc',
-        'browser/ui/webui/options2/home_page_overlay_handler2.h',
-        'browser/ui/webui/options2/import_data_handler2.cc',
-        'browser/ui/webui/options2/import_data_handler2.h',
-        'browser/ui/webui/options2/language_options_handler2.cc',
-        'browser/ui/webui/options2/language_options_handler2.h',
-        'browser/ui/webui/options2/language_options_handler_common2.cc',
-        'browser/ui/webui/options2/language_options_handler_common2.h',
-        'browser/ui/webui/options2/manage_profile_handler2.cc',
-        'browser/ui/webui/options2/manage_profile_handler2.h',
+        'browser/ui/webui/options2/chromeos/internet_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/internet_options_handler.h',
+        'browser/ui/webui/options2/chromeos/keyboard_handler.cc',
+        'browser/ui/webui/options2/chromeos/keyboard_handler.h',
+        'browser/ui/webui/options2/chromeos/language_chewing_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_chewing_handler.h',
+        'browser/ui/webui/options2/chromeos/language_hangul_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_hangul_handler.h',
+        'browser/ui/webui/options2/chromeos/language_mozc_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_mozc_handler.h',
+        'browser/ui/webui/options2/chromeos/language_options_util.cc',
+        'browser/ui/webui/options2/chromeos/language_options_util.h',
+        'browser/ui/webui/options2/chromeos/language_pinyin_handler.cc',
+        'browser/ui/webui/options2/chromeos/language_pinyin_handler.h',
+        'browser/ui/webui/options2/chromeos/pointer_handler.cc',
+        'browser/ui/webui/options2/chromeos/pointer_handler.h',
+        'browser/ui/webui/options2/chromeos/proxy_handler.cc',
+        'browser/ui/webui/options2/chromeos/proxy_handler.h',
+        'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h',
+        'browser/ui/webui/options2/chromeos/stats_options_handler.cc',
+        'browser/ui/webui/options2/chromeos/stats_options_handler.h',
+        'browser/ui/webui/options2/chromeos/user_image_source.cc',
+        'browser/ui/webui/options2/chromeos/user_image_source.h',
+        'browser/ui/webui/options2/chromeos/wallpaper_source.cc',
+        'browser/ui/webui/options2/chromeos/wallpaper_source.h',
+        'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.cc',
+        'browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h',
+        'browser/ui/webui/options2/clear_browser_data_handler.cc',
+        'browser/ui/webui/options2/clear_browser_data_handler.h',
+        'browser/ui/webui/options2/content_settings_handler.cc',
+        'browser/ui/webui/options2/content_settings_handler.h',
+        'browser/ui/webui/options2/cookies_view_handler.cc',
+        'browser/ui/webui/options2/cookies_view_handler.h',
+        'browser/ui/webui/options2/core_options_handler.cc',
+        'browser/ui/webui/options2/core_options_handler.h',
+        'browser/ui/webui/options2/font_settings_handler.cc',
+        'browser/ui/webui/options2/font_settings_handler.h',
+        'browser/ui/webui/options2/font_settings_utils.h',
+        'browser/ui/webui/options2/font_settings_utils_mac.mm',
+        'browser/ui/webui/options2/font_settings_utils_win.cc',
+        'browser/ui/webui/options2/font_settings_utils_x11.cc',
+        'browser/ui/webui/options2/handler_options_handler.cc',
+        'browser/ui/webui/options2/handler_options_handler.h',
+        'browser/ui/webui/options2/home_page_overlay_handler.cc',
+        'browser/ui/webui/options2/home_page_overlay_handler.h',
+        'browser/ui/webui/options2/import_data_handler.cc',
+        'browser/ui/webui/options2/import_data_handler.h',
+        'browser/ui/webui/options2/language_options_handler.cc',
+        'browser/ui/webui/options2/language_options_handler.h',
+        'browser/ui/webui/options2/language_options_handler_common.cc',
+        'browser/ui/webui/options2/language_options_handler_common.h',
+        'browser/ui/webui/options2/manage_profile_handler.cc',
+        'browser/ui/webui/options2/manage_profile_handler.h',
         'browser/ui/webui/options2/media_gallery_handler.cc',
         'browser/ui/webui/options2/media_gallery_handler.h',
         'browser/ui/webui/options2/options_sync_setup_handler.cc',
         'browser/ui/webui/options2/options_sync_setup_handler.h',
-        'browser/ui/webui/options2/options_ui2.cc',
-        'browser/ui/webui/options2/options_ui2.h',
-        'browser/ui/webui/options2/password_manager_handler2.cc',
-        'browser/ui/webui/options2/password_manager_handler2.h',
-        'browser/ui/webui/options2/search_engine_manager_handler2.cc',
-        'browser/ui/webui/options2/search_engine_manager_handler2.h',
-        'browser/ui/webui/options2/startup_pages_handler2.cc',
-        'browser/ui/webui/options2/startup_pages_handler2.h',
-        'browser/ui/webui/options2/web_intents_settings_handler2.cc',
-        'browser/ui/webui/options2/web_intents_settings_handler2.h',
+        'browser/ui/webui/options2/options_ui.cc',
+        'browser/ui/webui/options2/options_ui.h',
+        'browser/ui/webui/options2/password_manager_handler.cc',
+        'browser/ui/webui/options2/password_manager_handler.h',
+        'browser/ui/webui/options2/search_engine_manager_handler.cc',
+        'browser/ui/webui/options2/search_engine_manager_handler.h',
+        'browser/ui/webui/options2/startup_pages_handler.cc',
+        'browser/ui/webui/options2/startup_pages_handler.h',
+        'browser/ui/webui/options2/web_intents_settings_handler.cc',
+        'browser/ui/webui/options2/web_intents_settings_handler.h',
         'browser/ui/webui/performance_monitor/web_ui_handler.cc',
         'browser/ui/webui/performance_monitor/web_ui_handler.h',
         'browser/ui/webui/plugins_ui.cc',
         'browser/ui/webui/plugins_ui.h',
         'browser/ui/webui/policy_ui.cc',
         'browser/ui/webui/policy_ui.h',
         'browser/ui/webui/predictors/predictors_handler.cc',
         'browser/ui/webui/predictors/predictors_handler.h',
         'browser/ui/webui/predictors/predictors_ui.cc',
         'browser/ui/webui/predictors/predictors_ui.h',
@@ skipping 608 matching lines @@
             'third_party/mozilla_security_manager/nsNSSCertHelper.h',
             'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
             'third_party/mozilla_security_manager/nsNSSCertificate.h',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
         }, {  # use_nss==0
           'sources!': [
             'browser/certificate_manager_model.cc',
             'browser/certificate_manager_model.h',
-            'browser/ui/webui/options2/certificate_manager_handler2.cc',
-            'browser/ui/webui/options2/certificate_manager_handler2.h',
+            'browser/ui/webui/options2/certificate_manager_handler.cc',
+            'browser/ui/webui/options2/certificate_manager_handler.h',
           ],
         }],
         ['use_nss==0 and use_openssl==0', {
           'sources!': [
             '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',
           ],
         }],
@@ skipping 630 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }