Remove "2" suffixes from options2 code.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b640d274a1f31b194fc597f70c17cbe446637eba..bfd3770788965e8b02de4c9f6d8adcd33f406968 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1845,7 +1845,7 @@
         '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',
@@ -2948,20 +2948,20 @@
         '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',