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

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

Issue 1301583004: Revert of Delete dead signin code (SigninGlobalError) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//chrome/chrome_tests.gni") 9 import("//chrome/chrome_tests.gni")
10 import("//chrome/test/base/js2gtest.gni") 10 import("//chrome/test/base/js2gtest.gni")
(...skipping 1654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 } 1665 }
1666 } 1666 }
1667 if (enable_webrtc) { 1667 if (enable_webrtc) {
1668 sources += rebase_path( 1668 sources += rebase_path(
1669 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources, 1669 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources,
1670 ".", 1670 ".",
1671 "//chrome") 1671 "//chrome")
1672 } 1672 }
1673 if (is_chromeos) { 1673 if (is_chromeos) {
1674 deps += [ "//chrome/browser/chromeos:unit_tests" ] 1674 deps += [ "//chrome/browser/chromeos:unit_tests" ]
1675 sources -= [ "../browser/signin/signin_manager_unittest.cc" ] 1675 sources -= [
1676 "../browser/signin/signin_global_error_unittest.cc",
1677 "../browser/signin/signin_manager_unittest.cc",
1678 ]
1676 } 1679 }
1677 if (use_x11) { 1680 if (use_x11) {
1678 deps += [ "//ui/events/devices" ] 1681 deps += [ "//ui/events/devices" ]
1679 data_deps += [ "//tools/xdisplaycheck" ] 1682 data_deps += [ "//tools/xdisplaycheck" ]
1680 } else { 1683 } else {
1681 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 1684 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
1682 } 1685 }
1683 if (cld_version == 2) { 1686 if (cld_version == 2) {
1684 # Unit tests should be independent of the CLD2 access mechanism, just use 1687 # Unit tests should be independent of the CLD2 access mechanism, just use
1685 # static for simplicity. 1688 # static for simplicity.
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 "//third_party/mojo/src/mojo/edk/system", 1957 "//third_party/mojo/src/mojo/edk/system",
1955 ] 1958 ]
1956 1959
1957 if (!is_android && use_ash) { 1960 if (!is_android && use_ash) {
1958 sources += rebase_path( 1961 sources += rebase_path(
1959 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 1962 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
1960 ".", 1963 ".",
1961 "//chrome") 1964 "//chrome")
1962 } 1965 }
1963 } 1966 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698