Options: s/options2/options/.

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 1855 matching lines @@
         '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/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',
         'browser/ui/webui/signin/login_ui_service_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/webui/web_ui_util_unittest.cc',
@@ skipping 336 matching lines @@
             ['exclude', '^browser/policy/cros_user_policy_cache_unittest.cc'],
             ['exclude', '^browser/policy/device_policy_cache_unittest.cc'],
             ['exclude', '^browser/policy/device_status_collector_unittest.cc'],
             ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
             ['exclude', '^browser/policy/network_configuration_updater_unittest.cc' ],
             ['exclude', '^browser/policy/user_cloud_policy_store_chromeos_unittest.cc'],
             ['exclude', '^browser/ui/ash/ime_controller_chromeos_unittest.cc'],
             ['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', {
           'conditions': [
             ['selinux==0', {
               'dependencies': [
                 '../sandbox/sandbox.gyp:*',
               ],
             }],
             ['toolkit_views==1', {
@@ skipping 237 matching lines @@
             ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/omnibox/'],
             ['exclude', '^browser/ui/panels'],
             ['exclude', '^browser/ui/tabs/'],
             ['exclude', '^browser/ui/toolbar/'],
             ['exclude', '^browser/ui/webui/downloads_'],
             ['exclude', '^browser/ui/webui/feedback_'],
             ['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'],
             # No service process on Android.
             ['exclude', '^browser/service/'],
             ['exclude', '^common/service_'],
             ['exclude', '^service/'],
           ],
           'conditions': [
             ['gtest_target_type == "shared_library"', {
@@ skipping 477 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_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',
         '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 109 matching lines @@
               ],
               'dependencies': [
                 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb',
               ],
             }],
           ],
         }],
         ['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',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
         }, { #else: OS == "chromeos"
           'sources/': [
             # Protector is disabled on CrOS.
             ['exclude', '^browser/protector'],
@@ skipping 1555 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }