Move more files from chrome/test to chrome/test/base, part #3

BUG=90905
Review URL: http://codereview.chromium.org/7541001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94780 0039d316-1c4b-4281-b951-d872f2087c98

54 files changed, 98 insertions, 104 deletions

diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index aa064a2..e6ae4c8 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_structure.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index 6248356..8f2f8f6 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/component_updater/component_updater_interceptor.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/test/test_notification_tracker.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_notification_tracker.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_service.h"
 #include "content/test/test_url_fetcher_factory.h"
diff --git a/chrome/browser/gpu_browsertest.cc b/chrome/browser/gpu_browsertest.cc
index 5d99cb3..e9879476 100644
--- a/chrome/browser/gpu_browsertest.cc
+++ b/chrome/browser/gpu_browsertest.cc
@@ -11,8 +11,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/test_launcher_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/gpu_crash_browsertest.cc b/chrome/browser/gpu_crash_browsertest.cc
index 4cbf04a..344bcd8 100644
--- a/chrome/browser/gpu_crash_browsertest.cc
+++ b/chrome/browser/gpu_crash_browsertest.cc
@@ -10,8 +10,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/test_launcher_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/gl/gl_implementation.h"
diff --git a/chrome/browser/gpu_pixel_browsertest.cc b/chrome/browser/gpu_pixel_browsertest.cc
index c68a1a3..90f82d3 100644
--- a/chrome/browser/gpu_pixel_browsertest.cc
+++ b/chrome/browser/gpu_pixel_browsertest.cc
@@ -17,8 +17,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/test_launcher_utils.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/gpu_uitest.cc b/chrome/browser/gpu_uitest.cc
index 65b738e..d4c2c3bc 100644
--- a/chrome/browser/gpu_uitest.cc
+++ b/chrome/browser/gpu_uitest.cc
@@ -6,7 +6,7 @@
 
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/test_launcher_utils.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/gl/gl_implementation.h"
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 34dbcff..e547970 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -9,7 +9,7 @@
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/test_launcher_utils.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/ui/ui_layout_test.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h
index 96ae916..15cbcfc 100644
--- a/chrome/browser/net/gaia/token_service_unittest.h
+++ b/chrome/browser/net/gaia/token_service_unittest.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/test/base/signaling_task.h"
-#include "chrome/test/test_notification_tracker.h"
+#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc
index 8589e37..bff043a 100644
--- a/chrome/browser/process_singleton_uitest.cc
+++ b/chrome/browser/process_singleton_uitest.cc
@@ -24,7 +24,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/test_launcher_utils.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/ui/ui_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index 43c346e..6639ee3 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/safe_browsing/report.pb.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc
index d47793f..4af502e 100644
--- a/chrome/browser/sync/engine/syncapi_unittest.cc
+++ b/chrome/browser/sync/engine/syncapi_unittest.cc
@@ -41,8 +41,8 @@
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 #include "chrome/browser/sync/util/cryptographer.h"
+#include "chrome/test/base/values_test_util.h"
 #include "chrome/test/sync/engine/test_user_share.h"
-#include "chrome/test/values_test_util.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc
index 2e45415..d4b3ef8 100644
--- a/chrome/browser/sync/glue/http_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/http_bridge_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/sync/glue/http_bridge.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/test/test_server.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
index f642a50..2ced258 100644
--- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "chrome/test/testing_profile.h"
-#include "chrome/test/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/url_fetcher.h"
 #include "content/test/test_url_fetcher_factory.h"
diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
index bcfa9a4..7050afa 100644
--- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
+++ b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "net/base/cert_verifier.h"
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index 32cdfba..3ab7a73 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/sessions/session_state_unittest.cc b/chrome/browser/sync/sessions/session_state_unittest.cc
index 66ffedd..c12facd 100644
--- a/chrome/browser/sync/sessions/session_state_unittest.cc
+++ b/chrome/browser/sync/sessions/session_state_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/test/values_test_util.h"
+#include "chrome/test/base/values_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index 141361c..6377477 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/browser_with_test_window_test.h"
-#include "chrome/test/test_browser_window.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc b/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
index f4ab7ec..cb9324b 100644
--- a/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
+++ b/chrome/browser/sync/syncable/model_type_payload_map_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/test/values_test_util.h"
+#include "chrome/test/base/values_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncable {
diff --git a/chrome/browser/sync/syncable/model_type_unittest.cc b/chrome/browser/sync/syncable/model_type_unittest.cc
index 5461f76..b0c3eaa 100644
--- a/chrome/browser/sync/syncable/model_type_unittest.cc
+++ b/chrome/browser/sync/syncable/model_type_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/test/values_test_util.h"
+#include "chrome/test/base/values_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncable {
diff --git a/chrome/browser/sync/syncable/syncable_id_unittest.cc b/chrome/browser/sync/syncable/syncable_id_unittest.cc
index 7e1ee4e..56ab4a8 100644
--- a/chrome/browser/sync/syncable/syncable_id_unittest.cc
+++ b/chrome/browser/sync/syncable/syncable_id_unittest.cc
@@ -8,8 +8,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "chrome/test/base/values_test_util.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
-#include "chrome/test/values_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::vector;
diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc
index 9d7db7d..7d00d46 100644
--- a/chrome/browser/sync/syncable/syncable_unittest.cc
+++ b/chrome/browser/sync/syncable/syncable_unittest.cc
@@ -36,10 +36,10 @@
 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
+#include "chrome/test/base/values_test_util.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
 #include "chrome/test/sync/engine/test_syncable_utils.h"
 #include "chrome/test/sync/null_directory_change_delegate.h"
-#include "chrome/test/values_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc
index b63450b7..1f99c87 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/chrome/browser/sync/tools/sync_listen_notifications.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 
 // This is a simple utility that initializes a sync notifier and
diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
index 82c5de0..1428561 100644
--- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/browser_with_test_window_test.h"
-#include "chrome/test/test_browser_window.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ada1856..3d806af 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -38,7 +38,7 @@
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
-        # 'test/test_url_request_context_getter.h' brings in this requirement.
+        # 'test/base/test_url_request_context_getter.h' brings in this requirement.
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
@@ -145,6 +145,8 @@
         'test/automation/window_proxy.h',
         'test/base/bookmark_load_observer.cc',
         'test/base/bookmark_load_observer.h',
+        'test/base/chrome_test_suite.cc',
+        'test/base/chrome_test_suite.h',
         'test/base/in_process_browser_test.cc',
         'test/base/in_process_browser_test.h',
         'test/base/model_test_utils.cc',
@@ -153,28 +155,30 @@
         'test/base/profile_mock.h',
         'test/base/signaling_task.cc',
         'test/base/signaling_task.h',
+        'test/base/test_browser_window.cc',
+        'test/base/test_browser_window.h',
+        'test/base/test_launcher_utils.cc',
+        'test/base/test_launcher_utils.h',
+        'test/base/test_location_bar.cc',
+        'test/base/test_location_bar.h',
+        'test/base/test_url_request_context_getter.cc',
+        'test/base/test_url_request_context_getter.h',
         'test/base/ui_test_utils.cc',
         'test/base/ui_test_utils.h',
         'test/base/ui_test_utils_linux.cc',
         'test/base/ui_test_utils_mac.mm',
         'test/base/ui_test_utils_win.cc',
+        'test/base/values_test_util.cc',
+        'test/base/values_test_util.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_mac.cc',
-        'test/test_browser_window.cc',
-        'test/test_browser_window.h',
-        'test/test_launcher_utils.cc',
-        'test/test_launcher_utils.h',
-        'test/test_location_bar.cc',
-        'test/test_location_bar.h',
         'test/test_navigation_observer.cc',
         'test/test_navigation_observer.h',
         'test/test_switches.cc',
         'test/test_switches.h',
         'test/test_tab_strip_model_observer.cc',
         'test/test_tab_strip_model_observer.h',
-        'test/test_url_request_context_getter.cc',
-        'test/test_url_request_context_getter.h',
         'test/testing_browser_process.cc',
         'test/testing_browser_process.h',
         'test/testing_browser_process_test.h',
@@ -183,10 +187,6 @@
         'test/testing_profile.cc',
         'test/testing_profile.h',
         'test/thread_observer_helper.h',
-        'test/unit/chrome_test_suite.cc',
-        'test/unit/chrome_test_suite.h',
-        'test/values_test_util.cc',
-        'test/values_test_util.h',
         '../content/browser/geolocation/arbitrator_dependency_factories_for_test.cc',
         '../content/browser/geolocation/arbitrator_dependency_factories_for_test.h',
         '../content/browser/geolocation/mock_location_provider.cc',
@@ -389,14 +389,14 @@
         '..',
       ],
       'sources': [
-        'test/unit/run_all_unittests.cc',
+        'test/base/run_all_unittests.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
-            #   test/unit/run_all_unittests.cc
-            #   test/unit/chrome_test_suite.h
+            #   test/base/run_all_unittests.cc
+            #   test/base/chrome_test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
@@ -513,7 +513,6 @@
         'test/interactive_ui/view_event_test_base.cc',
         'test/interactive_ui/view_event_test_base.h',
         'test/out_of_proc_test_runner.cc',
-        'test/unit/chrome_test_suite.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -1978,6 +1977,10 @@
         'service/cloud_print/cloud_print_token_store_unittest.cc',
         'service/cloud_print/cloud_print_url_fetcher_unittest.cc',
         'service/service_process_unittest.cc',
+        'test/base/test_notification_tracker.cc',
+        'test/base/test_notification_tracker.h',
+        'test/base/v8_unit_test.cc',
+        'test/base/v8_unit_test.h',
         'test/browser_with_test_window_test.cc',
         'test/browser_with_test_window_test.h',
         'test/data/resource.rc',
@@ -1987,10 +1990,6 @@
         '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',
-        'test/v8_unit_test.cc',
-        'test/v8_unit_test.h',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../content/browser/appcache/chrome_appcache_service_unittest.cc',
         '../content/browser/browser_thread_unittest.cc',
@@ -3492,6 +3491,9 @@
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
+        'test/base/test_notification_tracker.cc',
+        'test/base/test_notification_tracker.h',
+        'test/data/resource.rc',
         'test/out_of_proc_test_runner.cc',
         'test/live_sync/bookmarks_helper.cc',
         'test/live_sync/bookmarks_helper.h',
@@ -3543,9 +3545,6 @@
         'test/live_sync/two_client_live_themes_sync_test.cc',
         'test/live_sync/two_client_live_typed_urls_sync_test.cc',
         'test/live_sync/two_client_preferences_sync_test.cc',
-        'test/test_notification_tracker.cc',
-        'test/test_notification_tracker.h',
-        'test/data/resource.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/chrome/common/net/gaia/google_service_auth_error_unittest.cc b/chrome/common/net/gaia/google_service_auth_error_unittest.cc
index 15ed78c..111bc55 100644
--- a/chrome/common/net/gaia/google_service_auth_error_unittest.cc
+++ b/chrome/common/net/gaia/google_service_auth_error_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/test/values_test_util.h"
+#include "chrome/test/base/values_test_util.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc
index e1b7758..414c6c3 100644
--- a/chrome/renderer/extensions/extension_api_json_validity_unittest.cc
+++ b/chrome/renderer/extensions/extension_api_json_validity_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
-#include "chrome/test/v8_unit_test.h"
+#include "chrome/test/base/v8_unit_test.h"
 #include "content/common/json_value_serializer.h"
 #include "grit/common_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc
index a932153..8e3c98b 100644
--- a/chrome/renderer/extensions/json_schema_unittest.cc
+++ b/chrome/renderer/extensions/json_schema_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/test/v8_unit_test.h"
+#include "chrome/test/base/v8_unit_test.h"
 #include "grit/renderer_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 69742aa..df9b847 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -19,8 +19,8 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/chrome_process_util.h"
-#include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/test_switches.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/child_process_info.h"
diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index 4a68fe1..e177b43 100644
--- a/chrome/test/unit/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/unit/chrome_test_suite.h"
+#include "chrome/test/base/chrome_test_suite.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
index a8d89e6..1a52ece 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/base/chrome_test_suite.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
-#define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
+#ifndef CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
+#define CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
 #pragma once
 
 #include <string>
@@ -72,4 +72,4 @@ class ChromeTestSuite : public base::TestSuite {
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
 };
 
-#endif  // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
+#endif  // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 2181878..ff23d0b 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -28,8 +28,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/testing_browser_process.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_process_host.h"
diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/base/run_all_unittests.cc
index aa548ef..455ec28 100644
--- a/chrome/test/unit/run_all_unittests.cc
+++ b/chrome/test/base/run_all_unittests.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/unit/chrome_test_suite.h"
+#include "chrome/test/base/chrome_test_suite.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
 
diff --git a/chrome/test/test_browser_window.cc b/chrome/test/base/test_browser_window.cc
index d3c17f7..ac82c36 100644
--- a/chrome/test/test_browser_window.cc
+++ b/chrome/test/base/test_browser_window.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_browser_window.h"
+#include "chrome/test/base/test_browser_window.h"
 
 #include "ui/gfx/rect.h"
 
diff --git a/chrome/test/test_browser_window.h b/chrome/test/base/test_browser_window.h
index e58926b..171d77e 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_TEST_BROWSER_WINDOW_H_
-#define CHROME_TEST_TEST_BROWSER_WINDOW_H_
+#ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
+#define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/test/test_location_bar.h"
+#include "chrome/test/base/test_location_bar.h"
 
 // An implementation of BrowserWindow used for testing. TestBrowserWindow only
 // contains a valid LocationBar, all other getters return NULL.
@@ -124,4 +124,4 @@ class TestBrowserWindow : public BrowserWindow {
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);
 };
 
-#endif  // CHROME_TEST_TEST_BROWSER_WINDOW_H_
+#endif  // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index 37426a5..039f30c 100644
--- a/chrome/test/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -10,7 +10,7 @@
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/test_launcher_utils.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 namespace {
diff --git a/chrome/test/test_launcher_utils.h b/chrome/test/base/test_launcher_utils.h
index 305387c..3c1a219 100644
--- a/chrome/test/test_launcher_utils.h
+++ b/chrome/test/base/test_launcher_utils.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_TEST_TEST_LAUNCHER_UTILS_H_
-#define CHROME_TEST_TEST_LAUNCHER_UTILS_H_
+#ifndef CHROME_TEST_BASE_TEST_LAUNCHER_UTILS_H_
+#define CHROME_TEST_BASE_TEST_LAUNCHER_UTILS_H_
 #pragma once
 
 #include <string>
@@ -37,4 +37,4 @@ int GetTestTerminationTimeout(const std::string& test_name,
 
 }  // namespace test_launcher_utils
 
-#endif  // CHROME_TEST_TEST_LAUNCHER_UTILS_H_
+#endif  // CHROME_TEST_BASE_TEST_LAUNCHER_UTILS_H_
diff --git a/chrome/test/test_location_bar.cc b/chrome/test/base/test_location_bar.cc
index 94ba49c..10e5e67 100644
--- a/chrome/test/test_location_bar.cc
+++ b/chrome/test/base/test_location_bar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_location_bar.h"
+#include "chrome/test/base/test_location_bar.h"
 
 TestLocationBar::TestLocationBar()
     : disposition_(CURRENT_TAB),
diff --git a/chrome/test/test_location_bar.h b/chrome/test/base/test_location_bar.h
index e3e582b..26437c7 100644
--- a/chrome/test/test_location_bar.h
+++ b/chrome/test/base/test_location_bar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_TEST_LOCATION_BAR_H_
-#define CHROME_TEST_TEST_LOCATION_BAR_H_
+#ifndef CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
+#define CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
 #pragma once
 
 #include "chrome/browser/first_run/first_run.h"
@@ -57,4 +57,4 @@ class TestLocationBar : public LocationBar {
 };
 
 
-#endif  // CHROME_TEST_TEST_LOCATION_BAR_H_
+#endif  // CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
diff --git a/chrome/test/test_notification_tracker.cc b/chrome/test/base/test_notification_tracker.cc
index 0daf899..556eceb 100644
--- a/chrome/test/test_notification_tracker.cc
+++ b/chrome/test/base/test_notification_tracker.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_notification_tracker.h"
+#include "chrome/test/base/test_notification_tracker.h"
 
 #include "content/common/notification_service.h"
 
diff --git a/chrome/test/test_notification_tracker.h b/chrome/test/base/test_notification_tracker.h
index fcb7ddf..ce18c52 100644
--- a/chrome/test/test_notification_tracker.h
+++ b/chrome/test/base/test_notification_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
-#define CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
+#ifndef CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
+#define CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
 #pragma once
 
 #include <vector>
@@ -79,4 +79,4 @@ class TestNotificationTracker : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(TestNotificationTracker);
 };
 
-#endif  // CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
+#endif  // CHROME_TEST_BASE_TEST_NOTIFICATION_TRACKER_H_
diff --git a/chrome/test/test_url_request_context_getter.cc b/chrome/test/base/test_url_request_context_getter.cc
index 8a5357a..91c7649 100644
--- a/chrome/test/test_url_request_context_getter.cc
+++ b/chrome/test/base/test_url_request_context_getter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_url_request_context_getter.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 
 #include "content/browser/browser_thread.h"
 #include "net/url_request/url_request_test_util.h"
diff --git a/chrome/test/test_url_request_context_getter.h b/chrome/test/base/test_url_request_context_getter.h
index f795945..7dd121c 100644
--- a/chrome/test/test_url_request_context_getter.h
+++ b/chrome/test/base/test_url_request_context_getter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_
-#define CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_
+#ifndef CHROME_TEST_BASE_TEST_URL_REQUEST_CONTEXT_GETTER_H_
+#define CHROME_TEST_BASE_TEST_URL_REQUEST_CONTEXT_GETTER_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -31,4 +31,4 @@ class TestURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_refptr<net::URLRequestContext> context_;
 };
 
-#endif  // CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_
+#endif  // CHROME_TEST_BASE_TEST_URL_REQUEST_CONTEXT_GETTER_H_
diff --git a/chrome/test/v8_unit_test.cc b/chrome/test/base/v8_unit_test.cc
index 281bacc..f699afe 100644
--- a/chrome/test/v8_unit_test.cc
+++ b/chrome/test/base/v8_unit_test.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #include "base/stringprintf.h"
 #include "base/string_piece.h"
-#include "chrome/test/v8_unit_test.h"
+#include "chrome/test/base/v8_unit_test.h"
 
 V8UnitTest::V8UnitTest() {}
 
diff --git a/chrome/test/v8_unit_test.h b/chrome/test/base/v8_unit_test.h
index e09eb2f..cdc1760 100644
--- a/chrome/test/v8_unit_test.h
+++ b/chrome/test/base/v8_unit_test.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_TEST_V8_UNIT_TEST_H_
-#define CHROME_TEST_V8_UNIT_TEST_H_
+#ifndef CHROME_TEST_BASE_V8_UNIT_TEST_H_
+#define CHROME_TEST_BASE_V8_UNIT_TEST_H_
 #pragma once
 
 #include <string>
@@ -56,4 +56,4 @@ class V8UnitTest : public testing::Test {
   v8::Handle<v8::Context> context_;
 };
 
-#endif  // CHROME_TEST_V8_UNIT_TEST_H_
+#endif  // CHROME_TEST_BASE_V8_UNIT_TEST_H_
diff --git a/chrome/test/values_test_util.cc b/chrome/test/base/values_test_util.cc
index 6181e96..1e27f1e 100644
--- a/chrome/test/values_test_util.cc
+++ b/chrome/test/base/values_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/values_test_util.h"
+#include "chrome/test/base/values_test_util.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
diff --git a/chrome/test/values_test_util.h b/chrome/test/base/values_test_util.h
index 0e9b948..cb0c340 100644
--- a/chrome/test/values_test_util.h
+++ b/chrome/test/base/values_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_VALUES_TEST_UTIL_H_
-#define CHROME_TEST_VALUES_TEST_UTIL_H_
+#ifndef CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
+#define CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
 #pragma once
 
 #include <string>
@@ -45,4 +45,4 @@ void ExpectStringValue(const std::string& expected_str,
 
 }  // namespace test
 
-#endif  // CHROME_TEST_VALUES_TEST_UTIL_H_
+#endif  // CHROME_TEST_BASE_VALUES_TEST_UTIL_H_
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h
index 35be3ad..0d0efb0 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -8,7 +8,7 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/test/test_browser_window.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/chrome/test/gpu/webgl_conformance_tests.cc
index 5f3971b..5ad9bc8 100644
--- a/chrome/test/gpu/webgl_conformance_tests.cc
+++ b/chrome/test/gpu/webgl_conformance_tests.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/test_launcher_utils.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/content_switches.h"
diff --git a/chrome/test/out_of_proc_test_runner.cc b/chrome/test/out_of_proc_test_runner.cc
index 8a0bdb2d..ccac6f4 100644
--- a/chrome/test/out_of_proc_test_runner.cc
+++ b/chrome/test/out_of_proc_test_runner.cc
@@ -22,9 +22,9 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/test_launcher_utils.h"
-#include "chrome/test/unit/chrome_test_suite.h"
+#include "chrome/test/base/test_launcher_utils.h"
 #include "net/base/escape.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 7dffdaa..0fc134b 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -44,8 +44,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/bookmark_load_observer.h"
+#include "chrome/test/base/test_url_request_context_getter.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/test_url_request_context_getter.h"
 #include "chrome/test/testing_pref_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
diff --git a/chrome/test/ui/ui_test_suite.h b/chrome/test/ui/ui_test_suite.h
index 47ce2ca..30e4567 100644
--- a/chrome/test/ui/ui_test_suite.h
+++ b/chrome/test/ui/ui_test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/process.h"
+#include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/test/unit/chrome_test_suite.h"
 
 class UITestSuite : public ChromeTestSuite {
  public:
diff --git a/chrome/test/unit/win/rundebug.bat b/chrome/test/unit/win/rundebug.bat
deleted file mode 100644
index 0b8c4bc..0000000
--- a/chrome/test/unit/win/rundebug.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rem This is a convenience batch file that you can use to run the debug-mode
-rem unit tests via a Windows shortcut.
-
-..\..\..\debug\UnitTests.exe
-pause
diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc
index 782af71..9568920 100644
--- a/content/browser/tab_contents/navigation_controller_unittest.cc
+++ b/content/browser/tab_contents/navigation_controller_unittest.cc
@@ -16,7 +16,7 @@
 //  #include "chrome/browser/sessions/session_service_factory.h"
 //  #include "chrome/browser/sessions/session_service_test_helper.h"
 //  #include "chrome/browser/sessions/session_types.h"
-#include "chrome/test/test_notification_tracker.h"
+#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index a6a462d..087e366 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/test/test_notification_tracker.h"
+#include "chrome/test/base/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/browser_url_handler.h"