summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 16:55:32 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 16:55:32 +0000
commit5bbe1597629c0b99b1dd9a80a634bd575bbb2a93 (patch)
treef39459f508d22ed882d9a1b737e443ad2fd83411 /ash/ash.gyp
parent9aa5c51b49de1934e40cd5e2b35b4d7187748e96 (diff)
downloadchromium_src-5bbe1597629c0b99b1dd9a80a634bd575bbb2a93.zip
chromium_src-5bbe1597629c0b99b1dd9a80a634bd575bbb2a93.tar.gz
chromium_src-5bbe1597629c0b99b1dd9a80a634bd575bbb2a93.tar.bz2
Create MetroViewerProcessHost as a common base for TestMetroViewerProcessHost and ChromeMetroViewerProcessHost
Bringing LaunchViewerAndWaitForConnection() to the common base so that ChromeMetroViewerProcessHost can also benefit from it (required for ash browser tests). BUG=179830 1st Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201806 Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=201966 R=robertshield@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/14629025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r--ash/ash.gyp5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 05d2788..90df2f0 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -575,9 +575,10 @@
['OS=="win"', {
'dependencies': [
'../ipc/ipc.gyp:ipc',
- '../ui/metro_viewer/metro_viewer.gyp:metro_viewer',
- '../win8/win8_tests.gyp:test_registrar',
+ '../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
+ '../win8/win8.gyp:metro_viewer',
'../win8/win8.gyp:test_support_win8',
+ '../win8/win8_tests.gyp:test_registrar',
],
'sources': [
'test/test_metro_viewer_process_host.cc',