10 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/browsing_data_database_helper_unittest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc
index 19c7c20..19c7c20 100644
--- a/chrome/browser/browsing_data_database_helper_unittest.cc
+++ b/chrome/browser/browsing_data_database_helper_browsertest.cc
diff --git a/chrome/browser/browsing_data_local_storage_helper_unittest.cc b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
index e98c5f1..e98c5f1 100644
--- a/chrome/browser/browsing_data_local_storage_helper_unittest.cc
+++ b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
diff --git a/chrome/browser/child_process_security_policy_browser_test.cc b/chrome/browser/child_process_security_policy_browsertest.cc
index 41ec56a..41ec56a 100644
--- a/chrome/browser/child_process_security_policy_browser_test.cc
+++ b/chrome/browser/child_process_security_policy_browsertest.cc
diff --git a/chrome/browser/extensions/extension_management_tests.cc b/chrome/browser/extensions/extension_management_browsertest.cc
index 5162ebe..5162ebe 100644
--- a/chrome/browser/extensions/extension_management_tests.cc
+++ b/chrome/browser/extensions/extension_management_browsertest.cc
diff --git a/chrome/browser/extensions/extension_shelf_model_unittest.cc b/chrome/browser/extensions/extension_shelf_model_browsertest.cc
index 59cf318..59cf318 100644
--- a/chrome/browser/extensions/extension_shelf_model_unittest.cc
+++ b/chrome/browser/extensions/extension_shelf_model_browsertest.cc
diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 309b055..309b055 100644
--- a/chrome/browser/extensions/extension_startup_unittest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model_unittest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index 031672e..031672e 100644
--- a/chrome/browser/extensions/extension_toolbar_model_unittest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
diff --git a/chrome/browser/views/browser_actions_container_unittest.cc b/chrome/browser/views/browser_actions_container_browsertest.cc
index 9612314..9612314 100644
--- a/chrome/browser/views/browser_actions_container_unittest.cc
+++ b/chrome/browser/views/browser_actions_container_browsertest.cc
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4aa5ddc..1d74d00 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -6,14 +6,14 @@
   'variables' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
-      'browser/views/browser_actions_container_unittest.cc',
+      'browser/views/browser_actions_container_browsertest.cc',
     ],
     'browser_tests_sources_win_specific': [
-      'browser/extensions/extension_shelf_model_unittest.cc',
+      'browser/extensions/extension_shelf_model_browsertest.cc',
       'browser/extensions/extension_storage_apitest.cc',
       'browser/extensions/extension_popup_apitest.cc',
       # TODO(jam): http://crbug.com/15101 These tests fail on Linux and Mac.
-      'browser/child_process_security_policy_browser_test.cc',
+      'browser/child_process_security_policy_browsertest.cc',
       'browser/renderer_host/test/web_cache_manager_browsertest.cc',
       'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
       'browser/views/browser_views_accessibility_browsertest.cc',
@@ -1222,8 +1222,8 @@
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browser_init_browsertest.cc',
-        'browser/browsing_data_database_helper_unittest.cc',
-        'browser/browsing_data_local_storage_helper_unittest.cc',
+        'browser/browsing_data_database_helper_browsertest.cc',
+        'browser/browsing_data_local_storage_helper_browsertest.cc',
         'browser/crash_recovery_browsertest.cc',
         'browser/dom_ui/file_browse_browsertest.cc',
         'browser/dom_ui/mediaplayer_browsertest.cc',
@@ -1258,14 +1258,14 @@
         'browser/extensions/extension_incognito_apitest.cc',
         'browser/extensions/extension_infobar_apitest.cc',
         'browser/extensions/extension_javascript_url_apitest.cc',
-        'browser/extensions/extension_management_tests.cc',
+        'browser/extensions/extension_management_browsertest.cc',
         'browser/extensions/extension_messages_apitest.cc',
         'browser/extensions/extension_metrics_apitest.cc',
         'browser/extensions/extension_override_apitest.cc',
         'browser/extensions/extension_processes_apitest.cc',
-        'browser/extensions/extension_startup_unittest.cc',
+        'browser/extensions/extension_startup_browsertest.cc',
         'browser/extensions/extension_tabs_apitest.cc',
-        'browser/extensions/extension_toolbar_model_unittest.cc',
+        'browser/extensions/extension_toolbar_model_browsertest.cc',
         'browser/extensions/extension_toolstrip_apitest.cc',
         'browser/extensions/extension_websocket_apitest.cc',
         'browser/extensions/fragment_navigation_apitest.cc',
@@ -1283,7 +1283,7 @@
         'browser/sessions/session_restore_browsertest.cc',
         'browser/ssl/ssl_browser_tests.cc',
         'browser/task_manager_browsertest.cc',
-        'renderer/form_autocomplete_unittest.cc',
+        'renderer/form_autocomplete_browsertest.cc',
         'test/automation/dom_automation_browsertest.cc',
         'test/render_view_test.cc',
         'test/render_view_test.h',
diff --git a/chrome/renderer/form_autocomplete_unittest.cc b/chrome/renderer/form_autocomplete_browsertest.cc
index d0a591e..d0a591e 100644
--- a/chrome/renderer/form_autocomplete_unittest.cc
+++ b/chrome/renderer/form_autocomplete_browsertest.cc