| OLD | NEW |
| 1 { | 1 { |
| 2 'includes': [ | 2 'includes': [ |
| 3 'extensions_tests.gypi', | 3 'extensions_tests.gypi', |
| 4 ], | 4 ], |
| 5 'variables': { | 5 'variables': { |
| 6 # Product name is used for Mac bundle. | 6 # Product name is used for Mac bundle. |
| 7 'app_shell_product_name': 'App Shell', | 7 'app_shell_product_name': 'App Shell', |
| 8 # The version is high enough to be supported by Omaha (at least 31) | 8 # The version is high enough to be supported by Omaha (at least 31) |
| 9 # but fake enough to be obviously not a Chrome release. | 9 # but fake enough to be obviously not a Chrome release. |
| 10 'app_shell_version': '38.1234.5678.9', | 10 'app_shell_version': '38.1234.5678.9', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 'msvs_disabled_warnings': [ 4267, ], | 54 'msvs_disabled_warnings': [ 4267, ], |
| 55 'conditions': [ | 55 'conditions': [ |
| 56 ['chromeos==1', { | 56 ['chromeos==1', { |
| 57 'dependencies': [ | 57 'dependencies': [ |
| 58 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', | 58 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', |
| 59 ], | 59 ], |
| 60 'sources': [ | 60 'sources': [ |
| 61 'browser/api/webcam_private/visca_webcam_unittest.cc', | 61 'browser/api/webcam_private/visca_webcam_unittest.cc', |
| 62 ], | 62 ], |
| 63 }], | 63 }], |
| 64 ['enable_wifi_display==1', { |
| 65 'sources': [ |
| 66 '<@(extensions_unittests_sources_wifi_display)', |
| 67 ], |
| 68 }], |
| 64 ], | 69 ], |
| 65 }, | 70 }, |
| 66 { | 71 { |
| 67 # GN version: //extensions:extensions_browsertests | 72 # GN version: //extensions:extensions_browsertests |
| 68 'target_name': 'extensions_browsertests', | 73 'target_name': 'extensions_browsertests', |
| 69 'type': '<(gtest_target_type)', | 74 'type': '<(gtest_target_type)', |
| 70 'dependencies': [ | 75 'dependencies': [ |
| 71 'extensions.gyp:extensions_test_support', | 76 'extensions.gyp:extensions_test_support', |
| 72 'shell/app_shell.gyp:app_shell_lib', | 77 'shell/app_shell.gyp:app_shell_lib', |
| 73 # TODO(yoz): find the right deps | 78 # TODO(yoz): find the right deps |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 'dependencies': [ | 146 'dependencies': [ |
| 142 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 143 ], | 148 ], |
| 144 }], | 149 }], |
| 145 ], | 150 ], |
| 146 } | 151 } |
| 147 ], | 152 ], |
| 148 }], | 153 }], |
| 149 ], | 154 ], |
| 150 } | 155 } |
| OLD | NEW |