Move a bunch more browser stuff around....

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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',
@@ skipping 1025 matching lines @@
         'browser/autofill/credit_card_field_unittest.cc',
         'browser/autofill/credit_card_unittest.cc',
         'browser/autofill/fax_field_unittest.cc',
         'browser/autofill/form_field_unittest.cc',
         'browser/autofill/form_structure_unittest.cc',
         'browser/autofill/name_field_unittest.cc',
         'browser/autofill/personal_data_manager_unittest.cc',
         'browser/autofill/phone_field_unittest.cc',
         'browser/autofill/phone_number_unittest.cc',
         'browser/automation/automation_provider_unittest.cc',
-        'browser/back_forward_menu_model_unittest.cc',
         'browser/background_contents_service_unittest.cc',
         'browser/background_mode_manager_unittest.cc',
         'browser/background_page_tracker_unittest.cc',
         'browser/bookmarks/bookmark_codec_unittest.cc',
         'browser/bookmarks/bookmark_context_menu_controller_unittest.cc',
         'browser/bookmarks/bookmark_html_writer_unittest.cc',
         'browser/bookmarks/bookmark_index_unittest.cc',
         'browser/bookmarks/bookmark_model_test_utils.cc',
         'browser/bookmarks/bookmark_model_test_utils.h',
         'browser/bookmarks/bookmark_model_unittest.cc',
@@ skipping 51 matching lines @@
         'browser/command_updater_unittest.cc',
         'browser/content_exceptions_table_model_unittest.cc',
         'browser/content_settings/content_settings_pattern_unittest.cc',
         'browser/content_settings/content_settings_provider_unittest.cc',
         'browser/content_settings/host_content_settings_map_unittest.cc',
         'browser/content_settings/mock_content_settings_provider.cc',
         'browser/content_settings/mock_content_settings_provider.h',
         'browser/cookies_tree_model_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
         'browser/device_orientation/provider_unittest.cc',
-        'browser/dock_info_unittest.cc',
         'browser/dom_ui/dom_ui_theme_source_unittest.cc',
         'browser/dom_ui/dom_ui_unittest.cc',
         'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc',
         'browser/dom_ui/shown_sections_handler_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/download_manager_unittest.cc',
         'browser/download/download_request_infobar_delegate_unittest.cc',
         'browser/download/download_request_limiter_unittest.cc',
         'browser/download/download_status_updater_unittest.cc',
         'browser/download/download_util_unittest.cc',
         'browser/download/save_package_unittest.cc',
-        'browser/encoding_menu_controller_unittest.cc',
         'browser/enumerate_modules_model_unittest_win.cc',
         'browser/extensions/convert_user_script_unittest.cc',
         'browser/extensions/convert_web_app_unittest.cc',
         'browser/extensions/default_apps_unittest.cc',
         'browser/extensions/extension_icon_manager_unittest.cc',
         'browser/extensions/extension_info_map_unittest.cc',
         'browser/extensions/extension_menu_manager_unittest.cc',
         'browser/extensions/extension_prefs_unittest.cc',
         'browser/extensions/extension_pref_store_unittest.cc',
         'browser/extensions/extension_process_manager_unittest.cc',
@@ skipping 403 matching lines @@
         'browser/ui/cocoa/toolbar_view_unittest.mm',
         'browser/ui/cocoa/translate/translate_infobar_unittest.mm',
         'browser/ui/cocoa/vertical_gradient_view_unittest.mm',
         'browser/ui/cocoa/view_resizer_pong.h',
         'browser/ui/cocoa/view_resizer_pong.mm',
         'browser/ui/cocoa/web_drop_target_unittest.mm',
         'browser/ui/cocoa/window_size_autosaver_unittest.mm',
         'browser/ui/cocoa/wrench_menu_button_cell_unittest.mm',
         'browser/ui/cocoa/wrench_menu_controller_unittest.mm',       
         'browser/ui/find_bar/find_backend_unittest.cc',
+        'browser/ui/tabs/dock_info_unittest.cc',
+        'browser/ui/toolbar/back_forward_menu_model_unittest.cc',
+        'browser/ui/toolbar/encoding_menu_controller_unittest.cc',
+        'browser/ui/toolbar/wrench_menu_model_unittest.cc',
         'browser/ui/views/accessibility_event_router_views_unittest.cc',
         'browser/ui/views/bookmark_bar_view_unittest.cc',
         'browser/ui/views/bookmark_context_menu_test.cc',
         'browser/ui/views/bookmark_editor_view_unittest.cc',
         'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
         'browser/ui/views/generic_info_view_unittest.cc',
         'browser/ui/views/info_bubble_unittest.cc',
         'browser/ui/views/reload_button_unittest.cc',
         'browser/ui/views/shell_dialogs_win_unittest.cc',
         'browser/ui/views/status_icons/status_tray_win_unittest.cc',
+        'browser/ui/window_sizer_unittest.cc',
         'browser/user_style_sheet_watcher_unittest.cc',
         'browser/visitedlink_unittest.cc',
         'browser/web_applications/web_app_unittest.cc',
         'browser/webdata/web_data_service_test_util.h',
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_unittest.cc',
         'browser/web_resource/web_resource_service_unittest.cc',
-        'browser/window_sizer_unittest.cc',
-        'browser/wrench_menu_model_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
         'common/chrome_paths_unittest.cc',
         'common/common_param_traits_unittest.cc',
         'common/content_settings_helper_unittest.cc',
         'common/deprecated/event_sys_unittest.cc',
         'common/desktop_notifications/active_notification_tracker_unittest.cc',
         'common/extensions/extension_action_unittest.cc',
         'common/extensions/extension_extent_unittest.cc',
         'common/extensions/extension_file_util_unittest.cc',
@@ skipping 175 matching lines @@
             'chrome',
             '../third_party/ocmock/ocmock.gyp:ocmock',
           ],
           'include_dirs': [
             '../third_party/GTM',
             '../third_party/GTM/AppKit',
           ],
           'sources!': [
             # Blocked on bookmark manager.
             'browser/bookmarks/bookmark_context_menu_controller_unittest.cc',
-            'browser/dock_info_unittest.cc',
+            'browser/ui/tabs/dock_info_unittest.cc',
             'browser/gtk/reload_button_gtk_unittest.cc',
             'browser/password_manager/password_store_default_unittest.cc',
             'tools/convert_dict/convert_dict_unittest.cc',
             '../third_party/hunspell/google/hunspell_tests.cc',
           ],
           # TODO(mark): We really want this for all non-static library targets,
           # but when we tried to pull it up to the common.gypi level, it broke
           # other things like the ui, startup, and page_cycler tests. *shrug*
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
 
@@ skipping 1751 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: