Options: s/options2/options/.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0e799c0cd93cc53552eebc5b6839da72c933ab42..9926d2341a69b5701c6fbaf104562c162a673a19 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1873,7 +1873,7 @@
         'browser/ui/webui/fileicon_source_unittest.cc',
         'browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc',
         'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
-        'browser/ui/webui/options2/language_options_handler_unittest.cc',
+        'browser/ui/webui/options/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',
@@ -2230,7 +2230,7 @@
             ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
             ['exclude', '^browser/ui/webui/chromeos/login'],
             ['exclude', '^browser/ui/webui/options/chromeos/'],
-            ['exclude', '^browser/ui/webui/options2/chromeos/'],
+            ['exclude', '^browser/ui/webui/options/chromeos/'],
           ],
         }],
         ['toolkit_uses_gtk == 1', {
@@ -2488,7 +2488,7 @@
             ['exclude', '^browser/ui/webui/flags_'],
             ['exclude', '^browser/ui/webui/help/'],
             ['exclude', '^browser/ui/webui/options/'],
-            ['exclude', '^browser/ui/webui/options2/'],
+            ['exclude', '^browser/ui/webui/options/'],
             ['exclude', '^browser/ui/webui/signin/'],
             ['exclude', '^browser/ui/webui/suggestions_internals'],
             ['exclude', '^browser/ui/webui/sync_promo'],
@@ -2986,22 +2986,22 @@
         '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_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/preferences_browsertest.cc',
-        'browser/ui/webui/options2/preferences_browsertest.h',
-        'browser/ui/webui/options2/search_engine_manager_browsertest.js',
+        'browser/ui/webui/options/autofill_options_browsertest.js',
+        'browser/ui/webui/options/browser_options_browsertest.js',
+        'browser/ui/webui/options/certificate_manager_browsertest.js',
+        'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',
+        'browser/ui/webui/options/content_options_browsertest.js',
+        'browser/ui/webui/options/content_settings_exception_area_browsertest.js',
+        'browser/ui/webui/options/cookies_view_browsertest.js',
+        'browser/ui/webui/options/font_settings_browsertest.js',
+        'browser/ui/webui/options/language_options_browsertest.js',
+        'browser/ui/webui/options/options_browsertest.js',
+        'browser/ui/webui/options/options_ui_browsertest.cc',
+        'browser/ui/webui/options/options_ui_browsertest.h',
+        'browser/ui/webui/options/password_manager_browsertest.js',
+        'browser/ui/webui/options/preferences_browsertest.cc',
+        'browser/ui/webui/options/preferences_browsertest.h',
+        'browser/ui/webui/options/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',
@@ -3131,7 +3131,7 @@
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
-            ['exclude', '^browser/ui/webui/options2/chromeos/'],
+            ['exclude', '^browser/ui/webui/options/chromeos/'],
           ],
           'sources!': [
             'browser/extensions/api/terminal/terminal_private_apitest.cc',