[Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc...

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 71453)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -1487,18 +1487,14 @@
         'browser/ui/cocoa/collected_cookies_mac_unittest.mm',
         'browser/ui/cocoa/command_observer_bridge_unittest.mm',
         'browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm',
-        'browser/ui/cocoa/content_exceptions_window_controller_unittest.mm',
         'browser/ui/cocoa/content_setting_bubble_cocoa_unittest.mm',
-        'browser/ui/cocoa/content_settings_dialog_controller_unittest.mm',
         'browser/ui/cocoa/cookie_details_unittest.mm',
         'browser/ui/cocoa/cookie_details_view_controller_unittest.mm',
-        'browser/ui/cocoa/custom_home_pages_model_unittest.mm',
         'browser/ui/cocoa/download/download_item_button_unittest.mm',
         'browser/ui/cocoa/download/download_shelf_mac_unittest.mm',
         'browser/ui/cocoa/download/download_shelf_view_unittest.mm',
         'browser/ui/cocoa/download/download_util_mac_unittest.mm',
         'browser/ui/cocoa/draggable_button_unittest.mm',
-        'browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm',
         'browser/ui/cocoa/event_utils_unittest.mm',
         'browser/ui/cocoa/extension_installed_bubble_controller_unittest.mm',
         'browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm',
@@ -1515,7 +1511,6 @@
         'browser/ui/cocoa/first_run_bubble_controller_unittest.mm',
         'browser/ui/cocoa/floating_bar_backing_view_unittest.mm',
         'browser/ui/cocoa/focus_tracker_unittest.mm',
-        'browser/ui/cocoa/font_language_settings_controller_unittest.mm',
         'browser/ui/cocoa/framed_browser_window_unittest.mm',
         'browser/ui/cocoa/fullscreen_window_unittest.mm',
         'browser/ui/cocoa/gradient_button_cell_unittest.mm',
@@ -1534,7 +1529,6 @@
         'browser/ui/cocoa/infobar_gradient_view_unittest.mm',
         'browser/ui/cocoa/instant_confirm_window_controller_unittest.mm',
         'browser/ui/cocoa/keystone_glue_unittest.mm',
-        'browser/ui/cocoa/keyword_editor_cocoa_controller_unittest.mm',
         'browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm',
         'browser/ui/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm',
         'browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm',
@@ -1552,14 +1546,21 @@
         'browser/ui/cocoa/nsimage_cache_unittest.mm',
         'browser/ui/cocoa/nsmenuitem_additions_unittest.mm',
         'browser/ui/cocoa/objc_method_swizzle_unittest.mm',
+        'browser/ui/cocoa/options/content_exceptions_window_controller_unittest.mm',
+        'browser/ui/cocoa/options/content_settings_dialog_controller_unittest.mm',
+        'browser/ui/cocoa/options/cookies_window_controller_unittest.mm',
+        'browser/ui/cocoa/options/custom_home_pages_model_unittest.mm',
+        'browser/ui/cocoa/options/edit_search_engine_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/options/font_language_settings_controller_unittest.mm',
+        'browser/ui/cocoa/options/keyword_editor_cocoa_controller_unittest.mm',
+        'browser/ui/cocoa/options/preferences_window_controller_unittest.mm',
+        'browser/ui/cocoa/options/search_engine_list_model_unittest.mm',
         'browser/ui/cocoa/page_info_bubble_controller_unittest.mm',
-        'browser/ui/cocoa/preferences_window_controller_unittest.mm',
         'browser/ui/cocoa/previewable_contents_controller_unittest.mm',
         'browser/ui/cocoa/reload_button_unittest.mm',
         'browser/ui/cocoa/rwhvm_editcommand_helper_unittest.mm',
         'browser/ui/cocoa/sad_tab_controller_unittest.mm',
         'browser/ui/cocoa/sad_tab_view_unittest.mm',
-        'browser/ui/cocoa/search_engine_list_model_unittest.mm',
         'browser/ui/cocoa/side_tab_strip_view_unittest.mm',
         'browser/ui/cocoa/simple_content_exceptions_window_controller_unittest.mm',
         'browser/ui/cocoa/status_bubble_mac_unittest.mm',