Move a bunch more browser stuff around....

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 68015)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -1043,7 +1043,6 @@
         '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',
@@ -1115,7 +1114,6 @@
         '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',
@@ -1127,7 +1125,6 @@
         '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',
@@ -1551,6 +1548,10 @@
         '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',
@@ -1561,6 +1562,7 @@
         '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',
@@ -1568,8 +1570,6 @@
         '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',
@@ -1765,7 +1765,7 @@
           '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',