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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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 | « chrome/chrome_tests.gypi ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 4a7f6750ccb1e73121724867aacc756d1e4bfe80..6c5b2b1400247fc67a22009f55eb3053b90c0312 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1560,9 +1560,6 @@
'test/data/unit/framework_unittest.gtestjs',
'test/logging/win/mof_data_parser_unittest.cc',
'tools/convert_dict/convert_dict_unittest.cc',
- '../ash/test/test_launcher_delegate.cc',
- '../ash/test/test_launcher_delegate.h',
- '../ash/test/test_shell_delegate.cc',
# TODO(joi): Move to 'base_prefs' target in base/base.gyp once
# Prefs move is complete and dependencies have been broken.
@@ -1700,6 +1697,7 @@
],
'dependencies': [
'../ash/ash.gyp:ash_resources',
+ '../ash/ash.gyp:test_support_ash',
],
# We eventually want to compile both in Win Aura builds, see
# http://crbug.com/155545.
@@ -1726,12 +1724,6 @@
['exclude', '^browser/ui/panels/display_settings_provider_win_unittest.cc'],
['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'],
],
- 'sources': [
- '../ash/test/multi_display_manager_test_api.cc',
- '../ash/test/multi_display_manager_test_api.h',
- '../ash/test/ash_test_base.cc',
- '../ash/test/ash_test_base.h',
- ],
}],
['enable_task_manager==0', {
'sources/': [
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698