get rid of old options pages

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 92cc416d0df8fa5e46c5eb35c515e2806f080c50..45310cdff292a97e263b2f5362696f1cfff81a46 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -818,9 +818,9 @@
         'browser/ui/views/find_bar_host_uitest.cc',
         'browser/ui/webui/bookmarks_ui_uitest.cc',
         'browser/ui/webui/ntp/new_tab_ui_uitest.cc',
-        'browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc',
-        'browser/ui/webui/options/options_ui_uitest.cc',
-        'browser/ui/webui/options/options_ui_uitest.h',
+        'browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc',
+        'browser/ui/webui/options2/options_ui2_uitest.cc',
+        'browser/ui/webui/options2/options_ui2_uitest.h',
         'browser/ui/webui/print_preview/print_preview_ui_uitest.cc',
         'common/chrome_switches_uitest.cc',
         'common/logging_chrome_uitest.cc',
@@ -1998,8 +1998,8 @@
         'browser/ui/webui/chrome_web_ui_data_source_unittest.cc',
         'browser/ui/webui/fileicon_source_unittest.cc',
         'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/ui/webui/options/chromeos/virtual_keyboard_manager_handler_unittest.cc',
-        'browser/ui/webui/options/language_options_handler_unittest.cc',
+        'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2_unittest.cc',
+        'browser/ui/webui/options2/language_options_handler2_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',
@@ -2831,19 +2831,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/options/advanced_options_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/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/password_manager_browsertest.js',
-        'browser/ui/webui/options/personal_options_browsertest.js',
-        'browser/ui/webui/options/search_engine_manager_browsertest.js',
+# TODO(estade): enable these.

[Dan Beam, 2012/03/23 03:25:31]

bug #?

+#        'browser/ui/webui/options/advanced_options2_browsertest.js',
+#        'browser/ui/webui/options/autofill_options2_browsertest.js',
+#        'browser/ui/webui/options/browser_options2_browsertest.js',
+#        'browser/ui/webui/options/certificate_manager2_browsertest.js',
+#        'browser/ui/webui/options/content_options2_browsertest.js',
+#        'browser/ui/webui/options/content_settings_exception_area2_browsertest.js',
+#        'browser/ui/webui/options/cookies_view2_browsertest.js',
+#        'browser/ui/webui/options/font_settings2_browsertest.js',
+#        'browser/ui/webui/options/language_options2_browsertest.js',
+#        'browser/ui/webui/options/options2_browsertest.js',
+#        'browser/ui/webui/options/password_manager2_browsertest.js',
+#        'browser/ui/webui/options/personal_options2_browsertest.js',
+#        'browser/ui/webui/options/search_engine_manager2_browsertest.js',
         'browser/ui/webui/sync_setup_browsertest.js',
         'browser/ui/webui/test_html_dialog_ui_delegate.cc',
         'browser/ui/webui/test_html_dialog_ui_delegate.h',