Even more test cleanup. Some fixes to non-test code.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f1620a0f9ba602ab787c2e7a601511a22a95d3df..f49f5cc2cf48334e6c77d335a472d140500d3dfa 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -57,6 +57,8 @@
         # The only thing used from browser is Browser::Type.
         'browser/extensions/test_extension_prefs.cc',
         'browser/extensions/test_extension_prefs.h',
+        'browser/geolocation/arbitrator_dependency_factories_for_test.cc',
+        'browser/geolocation/arbitrator_dependency_factories_for_test.h',
         'browser/geolocation/mock_location_provider.cc',
         'browser/geolocation/mock_location_provider.h',
         'browser/mock_browsing_data_appcache_helper.cc',
@@ -73,6 +75,8 @@
         #'browser/net/url_request_mock_http_job.h',
         'browser/net/url_request_mock_net_error_job.cc',
         'browser/net/url_request_mock_net_error_job.h',
+        'browser/notifications/notification_test_util.cc',
+        'browser/notifications/notification_test_util.h',
         'browser/prefs/pref_observer_mock.cc',
         'browser/prefs/pref_observer_mock.h',
         'browser/prefs/pref_service_mock_builder.cc',
@@ -87,6 +91,8 @@
         'browser/renderer_host/test/test_render_view_host.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
+        'browser/sync/engine/read_node_mock.cc',
+        'browser/sync/engine/read_node_mock.h',

[Lei Zhang, 2011/02/15 21:33:44]

Shouldn't these 2 be in sync_unit_tests? I don't think anyone else uses them.

[Elliot Glaysher, 2011/02/15 22:09:51]

Was confused. sync_unit_tests *doesn't* use them while unit_tests does. Fixed by
moving to unit_tests instead.

         'browser/sync/profile_sync_service_mock.cc',
         'browser/sync/profile_sync_service_mock.h',
         'browser/sync/syncable/syncable_mock.cc',
@@ -134,6 +140,8 @@
         'test/automation/tab_proxy.h',
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
+        'test/bookmark_load_observer.cc',
+        'test/bookmark_load_observer.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_mac.cc',
@@ -1158,7 +1166,6 @@
         'browser/autofill/autofill_profile_unittest.cc',
         'browser/autofill/autofill_type_unittest.cc',
         'browser/autofill/autofill_xml_parser_unittest.cc',
-        'browser/autofill/billing_address_unittest.cc',
         'browser/autofill/contact_info_unittest.cc',
         'browser/autofill/credit_card_field_unittest.cc',
         'browser/autofill/credit_card_unittest.cc',
@@ -1382,7 +1389,6 @@
         'browser/notifications/desktop_notifications_unittest.h',
         'browser/notifications/desktop_notifications_unittest.cc',
         'browser/notifications/notification_exceptions_table_model_unittest.cc',
-        'browser/notifications/notification_test_util.h',
         'browser/notifications/notifications_prefs_cache_unittest.cc',
         'browser/parsers/metadata_parser_filebase_unittest.cc',
         'browser/password_manager/encryptor_unittest.cc',
@@ -1830,6 +1836,7 @@
         'test/menu_model_test.h',
         'test/render_view_test.cc',
         'test/render_view_test.h',
+        'test/sync/test_http_bridge_factory.cc',
         'test/sync/test_http_bridge_factory.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
@@ -2822,7 +2829,6 @@
         'browser/sync/engine/mock_model_safe_workers.cc',
         'browser/sync/engine/mock_model_safe_workers.h',
         'browser/sync/engine/process_commit_response_command_unittest.cc',
-        'browser/sync/engine/read_node_mock.h',
         'browser/sync/engine/syncapi_unittest.cc',
         'browser/sync/engine/syncer_proto_util_unittest.cc',
         'browser/sync/engine/syncer_thread_unittest.cc',
@@ -2995,7 +3001,6 @@
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
-        'test/bookmark_load_observer.h',
         'test/out_of_proc_test_runner.cc',
         'test/live_sync/bookmark_model_verifier.cc',
         'test/live_sync/bookmark_model_verifier.h',