Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1202)

Unified Diff: content/content_tests.gypi

Issue 14304004: Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/test/browser_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
===================================================================
--- content/content_tests.gypi (revision 195684)
+++ content/content_tests.gypi (working copy)
@@ -304,7 +304,7 @@
'browser/in_process_webkit/webkit_thread_unittest.cc',
'browser/indexed_db/indexed_db_unittest.cc',
'browser/indexed_db/indexed_db_quota_client_unittest.cc',
- 'browser/loader/offline_policy_unittest.cc',
+ 'browser/loader/offline_policy_unittest.cc',
'browser/loader/resource_buffer_unittest.cc',
'browser/loader/resource_dispatcher_host_unittest.cc',
'browser/loader/resource_loader_unittest.cc',
@@ -436,6 +436,7 @@
'../webkit/blob/mock_blob_url_request_context.h',
'../webkit/blob/shareable_file_reference_unittest.cc',
'../webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc',
+ '../webkit/chromeos/fileapi/file_access_permissions_unittest.cc',
'../webkit/database/database_connections_unittest.cc',
'../webkit/database/database_quota_client_unittest.cc',
'../webkit/database/databases_table_unittest.cc',
@@ -518,6 +519,16 @@
'../webkit/plugins/npapi/plugin_list_unittest.cc',
'../webkit/plugins/npapi/plugin_utils_unittest.cc',
'../webkit/plugins/npapi/webplugin_impl_unittest.cc',
+ '../webkit/plugins/ppapi/host_var_tracker_unittest.cc',
+ '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
+ '../webkit/plugins/ppapi/mock_platform_image_2d.h',
+ '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
+ '../webkit/plugins/ppapi/mock_plugin_delegate.h',
+ '../webkit/plugins/ppapi/mock_resource.h',
+ '../webkit/plugins/ppapi/ppapi_plugin_instance_unittest.cc',
+ '../webkit/plugins/ppapi/ppapi_unittest.cc',
+ '../webkit/plugins/ppapi/ppapi_unittest.h',
+ '../webkit/plugins/ppapi/quota_file_io_unittest.cc',
'../webkit/quota/mock_quota_manager.cc',
'../webkit/quota/mock_quota_manager.h',
'../webkit/quota/mock_quota_manager_unittest.cc',
@@ -526,6 +537,7 @@
'../webkit/quota/quota_database_unittest.cc',
'../webkit/quota/quota_manager_unittest.cc',
'../webkit/quota/quota_temporary_storage_evictor_unittest.cc',
+ '../webkit/user_agent/user_agent_unittest.cc',
],
'conditions': [
['OS == "ios"', {
@@ -647,6 +659,15 @@
'browser/accessibility/browser_accessibility_win_unittest.cc',
],
}],
+ ['use_aura==1 and OS=="linux"', {
+ # http://crbug.com/234172: these tests depend on single process mode,
+ # which doesn't work in content_browsertests on Linux Aura.
+ 'sources!': [
+ 'renderer/dom_operations_browsertest.cc',
+ 'renderer/dom_serializer_browsertest.cc',
+ 'renderer/resource_fetcher_browsertest.cc',
+ ],
+ }],
['OS == "android"', {
'dependencies': [
'../ui/ui.gyp:shell_dialogs',
@@ -779,6 +800,9 @@
'renderer/browser_plugin/mock_browser_plugin_manager.cc',
'renderer/browser_plugin/browser_plugin_browsertest.h',
'renderer/browser_plugin/browser_plugin_browsertest.cc',
+ 'renderer/cpp_bound_class_unittest.cc',
+ 'renderer/dom_operations_browsertest.cc',
+ 'renderer/dom_serializer_browsertest.cc',
'renderer/mouse_lock_dispatcher_browsertest.cc',
'renderer/password_form_conversion_utils_browsertest.cc',
'renderer/pepper/mock_renderer_ppapi_host.cc',
@@ -790,6 +814,7 @@
'renderer/render_view_browsertest.cc',
'renderer/render_view_browsertest_mac.mm',
'renderer/render_widget_browsertest.cc',
+ 'renderer/resource_fetcher_browsertest.cc',
'test/browser_test_message_pump_android.cc',
'test/browser_test_message_pump_android.h',
'test/content_browser_test.h',
@@ -803,6 +828,8 @@
'test/layout_browsertest.h',
'test/layout_test_http_server.cc',
'test/layout_test_http_server.h',
+ '../webkit/glue/cpp_binding_example.cc',
+ '../webkit/glue/cpp_binding_example.h',
'../webkit/plugins/ppapi/mock_platform_image_2d.cc',
'../webkit/plugins/ppapi/mock_platform_image_2d.h',
'../webkit/plugins/ppapi/mock_plugin_delegate.cc',
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/test/browser_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698