Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 454521f3d0c33dedbe5cb79d62adf9720e7c3a0e..a73303dd83ef0daba6c1a1b74ad02cd896c6fea0 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -163,8 +163,6 @@ |
'test/test_render_view_host.h', |
'test/test_render_view_host_factory.cc', |
'test/test_render_view_host_factory.h', |
- 'test/test_time_source.cc', |
- 'test/test_time_source.h', |
'test/test_web_contents.cc', |
'test/test_web_contents.h', |
'test/test_web_contents_factory.cc', |
@@ -190,8 +188,8 @@ |
'browser/accessibility/dump_accessibility_browsertest_base.h', |
'browser/accessibility/dump_accessibility_events_browsertest.cc', |
'browser/accessibility/dump_accessibility_tree_browsertest.cc', |
- 'browser/accessibility/snapshot_ax_tree_browsertest.cc', |
'browser/accessibility/site_per_process_accessibility_browsertest.cc', |
+ 'browser/accessibility/snapshot_ax_tree_browsertest.cc', |
'browser/battery_status/battery_monitor_impl_browsertest.cc', |
'browser/battery_status/battery_monitor_integration_browsertest.cc', |
'browser/bookmarklet_browsertest.cc', |
@@ -249,8 +247,8 @@ |
'browser/web_contents/web_contents_view_aura_browsertest.cc', |
'browser/webkit_browsertest.cc', |
'browser/webui/web_ui_mojo_browsertest.cc', |
- 'child/site_isolation_policy_browsertest.cc', |
'child/child_discardable_shared_memory_manager_browsertest.cc', |
+ 'child/site_isolation_policy_browsertest.cc', |
'renderer/accessibility/renderer_accessibility_browsertest.cc', |
'renderer/devtools/v8_sampling_profiler_browsertest.cc', |
'renderer/gin_browsertest.cc', |
@@ -478,10 +476,10 @@ |
'browser/media/midi_host_unittest.cc', |
'browser/media/webrtc_identity_store_unittest.cc', |
'browser/net/sqlite_persistent_cookie_store_unittest.cc', |
+ 'browser/notification_service_impl_unittest.cc', |
'browser/notifications/notification_database_data_unittest.cc', |
'browser/notifications/notification_database_unittest.cc', |
'browser/notifications/platform_notification_context_unittest.cc', |
- 'browser/notification_service_impl_unittest.cc', |
'browser/power_monitor_message_broadcaster_unittest.cc', |
'browser/power_profiler/power_profiler_service_unittest.cc', |
'browser/power_usage_monitor_impl_unittest.cc', |
@@ -587,13 +585,6 @@ |
'child/notifications/notification_data_conversions_unittest.cc', |
'child/power_monitor_broadcast_source_unittest.cc', |
'child/resource_dispatcher_unittest.cc', |
- 'child/scheduler/nestable_task_runner_for_test.cc', |
- 'child/scheduler/nestable_task_runner_for_test.h', |
- 'child/scheduler/prioritizing_task_queue_selector_unittest.cc', |
- 'child/scheduler/scheduler_helper_unittest.cc', |
- 'child/scheduler/task_queue_manager_unittest.cc', |
- 'child/scheduler/webthread_impl_for_worker_scheduler_unittest.cc', |
- 'child/scheduler/worker_scheduler_impl_unittest.cc', |
'child/service_worker/service_worker_dispatcher_unittest.cc', |
'child/simple_webmimeregistry_impl_unittest.cc', |
'child/site_isolation_policy_unittest.cc', |
@@ -665,10 +656,7 @@ |
'renderer/media/video_capture_message_filter_unittest.cc', |
'renderer/render_thread_impl_unittest.cc', |
'renderer/render_widget_unittest.cc', |
- 'renderer/scheduler/deadline_task_runner_unittest.cc', |
- 'renderer/scheduler/renderer_scheduler_impl_unittest.cc', |
'renderer/scheduler/resource_dispatch_throttler_unittest.cc', |
- 'renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc', |
'renderer/screen_orientation/screen_orientation_dispatcher_unittest.cc', |
'renderer/skia_benchmarking_extension_unittest.cc', |
'test/fileapi_test_file_set.cc', |
@@ -873,6 +861,7 @@ |
'../cc/blink/cc_blink.gyp:cc_blink', |
'../cc/cc.gyp:cc', |
'../cc/cc_tests.gyp:cc_test_support', |
+ '../components/scheduler/scheduler.gyp:scheduler', |
'../gpu/blink/gpu_blink.gyp:gpu_blink', |
'../ipc/mojo/ipc_mojo.gyp:*', |
'../media/blink/media_blink.gyp:media_blink', |
@@ -1257,7 +1246,6 @@ |
'browser/renderer_host/input/input_router_impl_perftest.cc', |
'common/cc_messages_perftest.cc', |
'common/discardable_shared_memory_heap_perftest.cc', |
- 'child/scheduler/task_queue_manager_perftest.cc', |
'test/run_all_perftests.cc', |
], |
'conditions': [ |