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

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

Issue 1304393002: Revert "Reland c91b178b07b0d - 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
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 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 } 1669 }
1670 } 1670 }
1671 if (enable_webrtc) { 1671 if (enable_webrtc) {
1672 sources += rebase_path( 1672 sources += rebase_path(
1673 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources, 1673 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources,
1674 ".", 1674 ".",
1675 "//chrome") 1675 "//chrome")
1676 } 1676 }
1677 if (is_chromeos) { 1677 if (is_chromeos) {
1678 deps += [ "//chrome/browser/chromeos:unit_tests" ] 1678 deps += [ "//chrome/browser/chromeos:unit_tests" ]
1679 sources -= [ "../browser/signin/signin_manager_unittest.cc" ] 1679 sources -= [
1680 "../browser/signin/signin_global_error_unittest.cc",
1681 "../browser/signin/signin_manager_unittest.cc",
1682 ]
1680 } 1683 }
1681 if (use_x11) { 1684 if (use_x11) {
1682 deps += [ "//ui/events/devices" ] 1685 deps += [ "//ui/events/devices" ]
1683 data_deps += [ "//tools/xdisplaycheck" ] 1686 data_deps += [ "//tools/xdisplaycheck" ]
1684 } else { 1687 } else {
1685 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ] 1688 sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
1686 } 1689 }
1687 if (cld_version == 2) { 1690 if (cld_version == 2) {
1688 # Unit tests should be independent of the CLD2 access mechanism, just use 1691 # Unit tests should be independent of the CLD2 access mechanism, just use
1689 # static for simplicity. 1692 # static for simplicity.
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1959 "//third_party/mojo/src/mojo/edk/system", 1962 "//third_party/mojo/src/mojo/edk/system",
1960 ] 1963 ]
1961 1964
1962 if (!is_android && use_ash) { 1965 if (!is_android && use_ash) {
1963 sources += rebase_path( 1966 sources += rebase_path(
1964 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 1967 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
1965 ".", 1968 ".",
1966 "//chrome") 1969 "//chrome")
1967 } 1970 }
1968 } 1971 }
OLDNEW
« chrome/browser/signin/signin_ui_util.cc ('K') | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698