summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authorthiago.santos <thiago.santos@intel.com>2014-12-22 18:00:47 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-23 02:01:30 +0000
commit5c855a28156ed8f4d3f191ea7a1f9ee3dc777ee7 (patch)
treefda19fc7dc29a3f568a8822c168db674bbb6d83c /extensions/shell
parent00742d0a34d5aae0f59baedc1173702f22d2aeae (diff)
downloadchromium_src-5c855a28156ed8f4d3f191ea7a1f9ee3dc777ee7.zip
chromium_src-5c855a28156ed8f4d3f191ea7a1f9ee3dc777ee7.tar.gz
chromium_src-5c855a28156ed8f4d3f191ea7a1f9ee3dc777ee7.tar.bz2
Move system.display tests to extensions/
Also copy a few helper functions from extension_function_test_utils.h to api_test_utils.h so we don't need to depend on chrome/. These helper functions are needed by tests other than the display test and will help with the migration. BUG=392842 Review URL: https://codereview.chromium.org/779083002 Cr-Commit-Position: refs/heads/master@{#309514}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/app_shell.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 4fe3876..69581f2 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -315,6 +315,7 @@
'../browser/api/sockets_tcp/sockets_tcp_apitest.cc',
'../browser/api/sockets_udp/sockets_udp_apitest.cc',
'../browser/api/system_cpu/system_cpu_apitest.cc',
+ '../browser/api/system_display/system_display_apitest.cc',
'../browser/api/system_memory/system_memory_apitest.cc',
'../browser/api/system_network/system_network_apitest.cc',
'../browser/api/system_storage/storage_api_test_util.cc',