| OLD | NEW | 
|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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("//services/catalog/public/tools/catalog.gni") | 5 import("//services/catalog/public/tools/catalog.gni") | 
| 6 import("//services/service_manager/public/service_manifest.gni") | 6 import("//services/service_manager/public/service_manifest.gni") | 
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") | 
| 8 | 8 | 
| 9 service_manifest("manifest") { | 9 service_manifest("manifest") { | 
| 10   name = "preferences2" | 10   name = "preferences2" | 
| 11   source = "manifest.json" | 11   source = "manifest.json" | 
| 12 } | 12 } | 
| 13 | 13 | 
|  | 14 service_manifest("forwarder_manifest") { | 
|  | 15   name = "preferences_forwarder" | 
|  | 16   source = "forwarder_manifest.json" | 
|  | 17 } | 
|  | 18 | 
| 14 source_set("preferences") { | 19 source_set("preferences") { | 
| 15   visibility = [ | 20   visibility = [ | 
| 16     ":*", | 21     ":*", | 
| 17     "//services/preferences/public/cpp:service_main", | 22     "//services/preferences/public/cpp:service_main", | 
| 18   ] | 23   ] | 
| 19   deps = [ | 24   deps = [ | 
| 20     "//components/prefs", | 25     "//components/prefs", | 
| 21     "//services/preferences/public/cpp", | 26     "//services/preferences/public/cpp", | 
| 22     "//services/preferences/public/interfaces", | 27     "//services/preferences/public/interfaces", | 
| 23     "//services/service_manager/public/cpp", | 28     "//services/service_manager/public/cpp", | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 60 service_manifest("unittest_manifest") { | 65 service_manifest("unittest_manifest") { | 
| 61   name = "prefs_unittests" | 66   name = "prefs_unittests" | 
| 62   source = "unittest_manifest.json" | 67   source = "unittest_manifest.json" | 
| 63   packaged_services = [ ":manifest" ] | 68   packaged_services = [ ":manifest" ] | 
| 64 } | 69 } | 
| 65 | 70 | 
| 66 catalog("tests_catalog") { | 71 catalog("tests_catalog") { | 
| 67   testonly = true | 72   testonly = true | 
| 68   embedded_services = [ ":unittest_manifest" ] | 73   embedded_services = [ ":unittest_manifest" ] | 
| 69 } | 74 } | 
| OLD | NEW | 
|---|