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

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

Issue 2698913005: Re-enable preferences service access for browser+ash (Closed)
Patch Set: . Created 3 years, 10 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/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
(...skipping 2363 matching lines...) Expand 10 before | Expand all | Expand 10 after
2374 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc", 2374 "../browser/ui/views/sync/profile_signin_confirmation_dialog_views_brows ertest.cc",
2375 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc", 2375 "../browser/ui/webui/signin/inline_login_ui_browsertest.cc",
2376 2376
2377 # chromeos does not use the desktop user manager 2377 # chromeos does not use the desktop user manager
2378 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc", 2378 "../browser/ui/webui/signin/user_manager_ui_browsertest.cc",
2379 ] 2379 ]
2380 deps += [ 2380 deps += [
2381 "//chrome/browser/chromeos:arc_test_support", 2381 "//chrome/browser/chromeos:arc_test_support",
2382 "//chromeos/ime:gencode", 2382 "//chromeos/ime:gencode",
2383 "//components/arc:arc_test_support", 2383 "//components/arc:arc_test_support",
2384 "//components/prefs",
2384 "//components/user_manager:test_support", 2385 "//components/user_manager:test_support",
2386 "//services/preferences/public/cpp",
2387 "//services/preferences/public/interfaces",
2388 "//services/service_manager/public/cpp",
2385 "//ui/login:resources", 2389 "//ui/login:resources",
2386 ] 2390 ]
2387 2391
2388 if (use_dbus) { 2392 if (use_dbus) {
2389 deps += [ "//dbus:test_support" ] 2393 deps += [ "//dbus:test_support" ]
2390 } 2394 }
2391 } else { # !is_chromeos 2395 } else { # !is_chromeos
2392 sources -= [ 2396 sources -= [
2393 "../browser/extensions/api/enterprise_device_attributes/enterprise_devic e_attributes_apitest.cc", 2397 "../browser/extensions/api/enterprise_device_attributes/enterprise_devic e_attributes_apitest.cc",
2394 "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_ keys_apitest_nss.cc", 2398 "../browser/extensions/api/enterprise_platform_keys/enterprise_platform_ keys_apitest_nss.cc",
(...skipping 2784 matching lines...) Expand 10 before | Expand all | Expand 10 after
5179 } 5183 }
5180 5184
5181 if (is_win) { 5185 if (is_win) {
5182 loadable_module("conflicts_dll") { 5186 loadable_module("conflicts_dll") {
5183 testonly = true 5187 testonly = true
5184 sources = [ 5188 sources = [
5185 "conflicts/conflicts_dll.cc", 5189 "conflicts/conflicts_dll.cc",
5186 ] 5190 ]
5187 } 5191 }
5188 } 5192 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698