Remove "2" suffixes from options2 code.

chrome/chrome_tests.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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 1829 matching lines @@
         'browser/ui/views/status_icons/status_tray_win_unittest.cc',
         'browser/ui/views/tabs/fake_base_tab_strip_controller.cc',
         'browser/ui/views/tabs/fake_base_tab_strip_controller.h',
         'browser/ui/views/tabs/tab_unittest.cc',
         'browser/ui/views/tabs/tab_strip_unittest.cc',
         'browser/ui/views/tabs/touch_tab_strip_layout_unittest.cc',
         'browser/ui/website_settings/website_settings_unittest.cc',
         'browser/ui/webui/chrome_web_ui_data_source_unittest.cc',
         'browser/ui/webui/fileicon_source_unittest.cc',
         'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
-        'browser/ui/webui/options2/language_options_handler2_unittest.cc',
+        'browser/ui/webui/options2/language_options_handler_unittest.cc',
         'browser/ui/webui/policy_ui_unittest.cc',
         'browser/ui/webui/print_preview/print_preview_handler_unittest.cc',
         'browser/ui/webui/print_preview/print_preview_ui_unittest.cc',
         'browser/ui/webui/sync_internals_ui_unittest.cc',
         'browser/ui/webui/sync_setup_handler_unittest.cc',
         'browser/ui/webui/theme_source_unittest.cc',
         'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc',
         'browser/ui/webui/web_ui_unittest.cc',
         'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
         'browser/ui/window_sizer/window_sizer_unittest.cc',
@@ skipping 1082 matching lines @@
         'browser/ui/webui/ntp/most_visited_browsertest.cc',
         'browser/ui/webui/test_chrome_web_ui_controller_factory_browsertest.cc',
         'browser/ui/webui/bidi_checker_web_ui_test.cc',
         'browser/ui/webui/bidi_checker_web_ui_test.h',
         'browser/ui/webui/bookmarks_ui_browsertest.cc',
         'browser/ui/webui/extensions/extension_settings_browsertest.js',
         'browser/ui/webui/inspect_ui_browsertest.cc',
         'browser/ui/webui/net_internals/net_internals_ui_browsertest.cc',
         'browser/ui/webui/net_internals/net_internals_ui_browsertest.h',
         'browser/ui/webui/ntp/new_tab_ui_browsertest.cc',
-        'browser/ui/webui/options2/autofill_options2_browsertest.js',
-        'browser/ui/webui/options2/browser_options2_browsertest.js',
-        'browser/ui/webui/options2/certificate_manager2_browsertest.js',
-        'browser/ui/webui/options2/chromeos/guest_mode_options_ui2_browsertest.cc',
-        'browser/ui/webui/options2/content_options2_browsertest.js',
-        'browser/ui/webui/options2/content_settings_exception_area2_browsertest.js',
-        'browser/ui/webui/options2/cookies_view2_browsertest.js',
-        'browser/ui/webui/options2/font_settings2_browsertest.js',
-        'browser/ui/webui/options2/language_options2_browsertest.js',
-        'browser/ui/webui/options2/options2_browsertest.js',
-        'browser/ui/webui/options2/options_ui2_browsertest.cc',
-        'browser/ui/webui/options2/options_ui2_browsertest.h',
-        'browser/ui/webui/options2/password_manager2_browsertest.js',
-        'browser/ui/webui/options2/search_engine_manager2_browsertest.js',
+        'browser/ui/webui/options2/autofill_options_browsertest.js',
+        'browser/ui/webui/options2/browser_options_browsertest.js',
+        'browser/ui/webui/options2/certificate_manager_browsertest.js',
+        'browser/ui/webui/options2/chromeos/guest_mode_options_ui_browsertest.cc',
+        'browser/ui/webui/options2/content_options_browsertest.js',
+        'browser/ui/webui/options2/content_settings_exception_area_browsertest.js',
+        'browser/ui/webui/options2/cookies_view_browsertest.js',
+        'browser/ui/webui/options2/font_settings_browsertest.js',
+        'browser/ui/webui/options2/language_options_browsertest.js',
+        'browser/ui/webui/options2/options_browsertest.js',
+        'browser/ui/webui/options2/options_ui_browsertest.cc',
+        'browser/ui/webui/options2/options_ui_browsertest.h',
+        'browser/ui/webui/options2/password_manager_browsertest.js',
+        'browser/ui/webui/options2/search_engine_manager_browsertest.js',
         'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
         'browser/ui/webui/sync_setup_browsertest.js',
         'browser/ui/webui/test_web_dialog_delegate.cc',
         'browser/ui/webui/test_web_dialog_delegate.h',
         'browser/ui/webui/web_ui_browsertest.cc',
         'browser/ui/webui/web_ui_browsertest.h',
         'browser/ui/webui/web_ui_test_handler.cc',
         'browser/ui/webui/web_ui_test_handler.h',
         'browser/unload_browsertest.cc',
         'common/mac/mock_launchd.cc',
@@ skipping 1695 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }