| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") | 
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") | 
| 7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") | 
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") | 
| 9 | 9 | 
| 10 # This target exists to reference other test executables to bring these files | 10 # This target exists to reference other test executables to bring these files | 
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 205     "//base", | 205     "//base", | 
| 206     "//chrome:resources", | 206     "//chrome:resources", | 
| 207     "//chrome:strings", | 207     "//chrome:strings", | 
| 208     "//chrome/browser", | 208     "//chrome/browser", | 
| 209     "//chrome/common", | 209     "//chrome/common", | 
| 210     "//mojo/environment:chromium", | 210     "//mojo/environment:chromium", | 
| 211     "//third_party/mojo/src/mojo/edk/system", | 211     "//third_party/mojo/src/mojo/edk/system", | 
| 212   ] | 212   ] | 
| 213 } | 213 } | 
| 214 | 214 | 
| 215 if (!is_android) { | 215 if (!is_android && (!is_win || link_chrome_on_windows)) { | 
| 216   gypi_values = exec_script("//build/gypi_to_gn.py", | 216   gypi_values = exec_script("//build/gypi_to_gn.py", | 
| 217                             [ rebase_path("../chrome_tests.gypi") ], | 217                             [ rebase_path("../chrome_tests.gypi") ], | 
| 218                             "scope", | 218                             "scope", | 
| 219                             [ "../chrome_tests.gypi" ]) | 219                             [ "../chrome_tests.gypi" ]) | 
| 220 | 220 | 
| 221   test("interactive_ui_tests") { | 221   test("interactive_ui_tests") { | 
| 222     sources = rebase_path(gypi_values.chrome_interactive_ui_test_sources, | 222     sources = rebase_path(gypi_values.chrome_interactive_ui_test_sources, | 
| 223                           ".", | 223                           ".", | 
| 224                           "//chrome") | 224                           "//chrome") | 
| 225 | 225 | 
| (...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1154     # TODO(GYP) CDM adapter stuff. | 1154     # TODO(GYP) CDM adapter stuff. | 
| 1155     #if (enable_pepper_cdms) { | 1155     #if (enable_pepper_cdms) { | 
| 1156     #  deps += [ | 1156     #  deps += [ | 
| 1157     #    "//media/cdm/ppapi:clearkeycdmadapter", | 1157     #    "//media/cdm/ppapi:clearkeycdmadapter", | 
| 1158     #    "//ppapi:ppapi_cpp", | 1158     #    "//ppapi:ppapi_cpp", | 
| 1159     #    "//third_party/widevine/cdm:adapter", | 1159     #    "//third_party/widevine/cdm:adapter", | 
| 1160     #  ] | 1160     #  ] | 
| 1161     #} | 1161     #} | 
| 1162   } | 1162   } | 
| 1163 } | 1163 } | 
| OLD | NEW | 
|---|