| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index f722ef7c38b53efe08ae6b679e2e4c51fd697104..603f5a2a601e685b76ff92506eef123d19350e34 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -906,7 +906,6 @@
|
| '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',
|
| @@ -917,7 +916,6 @@
|
| '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',
|
| @@ -2275,6 +2273,8 @@
|
| },
|
| 'sources': [
|
| '<@(chrome_unit_tests_sources)',
|
| + '<@(chrome_unit_tests_js_sources)',
|
| + '<@(chrome_unit_tests_gtestjs_sources)',
|
| ],
|
| 'conditions': [
|
| ['OS!="ios"', {
|
| @@ -2298,6 +2298,11 @@
|
| '../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',
|
| @@ -2341,20 +2346,7 @@
|
| ],
|
| }],
|
| ['OS!="android" and OS!="ios"', {
|
| - 'dependencies': [
|
| - '../v8/tools/gyp/v8.gyp:v8',
|
| - ],
|
| - '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)',
|
| - ],
|
| + 'sources': [ '<@(chrome_unit_tests_non_mobile_sources)' ],
|
| }],
|
| ['chromeos==1', {
|
| 'sources!': [
|
|
|