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

Side by Side Diff: chrome/test/BUILD.gn

Issue 1084123002: Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bauerb@ review Created 5 years, 8 months 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 unified diff | Download patch
OLDNEW
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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 # TODO(GYP) if (is_win) { 677 # TODO(GYP) if (is_win) {
678 # ['incremental_chrome_dll==1', { 678 # ['incremental_chrome_dll==1', {
679 # 'UseLibraryDependencyInputs': "true", 679 # 'UseLibraryDependencyInputs': "true",
680 # } 680 # }
681 681
682 if (cld_version == 0 || cld_version == 2) { 682 if (cld_version == 0 || cld_version == 2) {
683 # Because the browser_tests use translate, they need CLD data. 683 # Because the browser_tests use translate, they need CLD data.
684 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 684 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
685 } 685 }
686 686
687 if (enable_plugins) {
688 sources += chrome_tests_gypi_values.chrome_browser_tests_plugins_sources
689 }
687 if (!enable_one_click_signin) { 690 if (!enable_one_click_signin) {
688 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ] 691 sources -= [ "../browser/ui/sync/one_click_signin_bubble_links_delegate_br owsertest.cc" ]
689 } 692 }
690 if (enable_nacl) { 693 if (enable_nacl) {
691 sources += [ 694 sources += [
692 "../browser/extensions/extension_nacl_browsertest.cc", 695 "../browser/extensions/extension_nacl_browsertest.cc",
693 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", 696 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc",
694 ] 697 ]
695 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] 698 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
696 699
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 } 1744 }
1742 1745
1743 if (cld_version == 0 || cld_version == 2) { 1746 if (cld_version == 0 || cld_version == 2) {
1744 # Use whatever CLD2 data access mode that the 1747 # Use whatever CLD2 data access mode that the
1745 # application embedder is using. 1748 # application embedder is using.
1746 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1749 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1747 } 1750 }
1748 } 1751 }
1749 } 1752 }
1750 } 1753 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698