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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 1491773002: MD Downloads: add a JS unit test for search term splitting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new-dl-data
Patch Set: Created 5 years 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
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d782f5422ddf91eab4600dbfcb78dc794f826f1a..af0adb971a24f5909c7d798d8ee045c968529f34 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1093,6 +1093,7 @@
'browser/resources/google_now/common_test_util.js',
'browser/resources/google_now/utility.js',
'browser/resources/google_now/utility_test_util.js',
+ 'browser/resources/md_downloads/action_service.js',
'browser/resources/print_preview/data/measurement_system.js',
'browser/resources/print_preview/print_preview_utils.js',
'renderer/resources/extensions/notifications_custom_bindings.js',
@@ -1103,6 +1104,7 @@
'browser/resources/google_now/background_unittest.gtestjs',
'browser/resources/google_now/cards_unittest.gtestjs',
'browser/resources/google_now/utility_unittest.gtestjs',
+ 'browser/resources/md_downloads/action_service_unittest.gtestjs',
'browser/resources/print_preview/data/measurement_system_unittest.gtestjs',
'browser/resources/print_preview/print_preview_utils_unittest.gtestjs',
'renderer/resources/extensions/notifications_custom_bindings.gtestjs',
@@ -2229,8 +2231,6 @@
},
'sources': [
'<@(chrome_unit_tests_sources)',
- '<@(chrome_unit_tests_js_sources)',
- '<@(chrome_unit_tests_gtestjs_sources)',
],
'conditions': [
['OS!="ios"', {
@@ -2254,11 +2254,6 @@
'../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
'../ui/gl/gl.gyp:gl',
'../ui/gl/gl.gyp:gl_test_support',
- '../v8/tools/gyp/v8.gyp:v8',
- ],
- # TODO(scr): Use this in browser_tests too.
- 'includes': [
- 'js_unittest_rules.gypi',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/chrome',
@@ -2302,7 +2297,21 @@
],
}],
['OS!="android" and OS!="ios"', {
- 'sources': [ '<@(chrome_unit_tests_non_mobile_sources)' ],
+ 'dependencies': [
+ '../v8/tools/gyp/v8.gyp:v8',
+ ],
+ # TODO(scr): Use this in browser_tests too.
dpapad 2015/12/03 01:19:41 Is this TODO relevant anymore?
Dan Beam 2015/12/11 08:17:22 Done.
+ 'includes': [
+ 'js_unittest_rules.gypi',
+ ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome',
+ ],
+ 'sources': [
+ '<@(chrome_unit_tests_non_mobile_sources)',
+ '<@(chrome_unit_tests_js_sources)',
+ '<@(chrome_unit_tests_gtestjs_sources)',
+ ],
}],
['chromeos==1', {
'sources!': [

Powered by Google App Engine
This is Rietveld 408576698