Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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("//url/config.gni") | 9 import("//url/config.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 787 "//v8", | 787 "//v8", |
| 788 ] | 788 ] |
| 789 } | 789 } |
| 790 } | 790 } |
| 791 | 791 |
| 792 if (use_v8_in_net && !is_android) { | 792 if (use_v8_in_net && !is_android) { |
| 793 source_set("net_browser_services") { | 793 source_set("net_browser_services") { |
| 794 sources = [ | 794 sources = [ |
| 795 "dns/mojo_host_resolver_impl.cc", | 795 "dns/mojo_host_resolver_impl.cc", |
| 796 "dns/mojo_host_resolver_impl.h", | 796 "dns/mojo_host_resolver_impl.h", |
| 797 "proxy/in_process_mojo_proxy_resolver_factory.cc", | |
| 798 "proxy/in_process_mojo_proxy_resolver_factory.h", | |
| 797 "proxy/mojo_proxy_resolver_factory.h", | 799 "proxy/mojo_proxy_resolver_factory.h", |
| 798 "proxy/proxy_resolver_mojo.cc", | 800 "proxy/proxy_resolver_mojo.cc", |
| 799 "proxy/proxy_resolver_mojo.h", | 801 "proxy/proxy_resolver_mojo.h", |
| 802 "proxy/proxy_service_mojo.cc", | |
| 803 "proxy/proxy_service_mojo.h", | |
| 800 ] | 804 ] |
| 801 | 805 |
| 802 public_deps = [ | 806 public_deps = [ |
| 803 ":mojo_type_converters", | 807 ":mojo_type_converters", |
| 804 ":net", | 808 ":net", |
| 805 "//base", | 809 "//base", |
| 806 "//net/interfaces", | 810 "//net/interfaces", |
| 807 "//third_party/mojo/src/mojo/public/cpp/bindings", | 811 "//third_party/mojo/src/mojo/public/cpp/bindings", |
| 812 | |
| 813 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need | |
| 814 # this dependency since in_process_mojo_proxy_resolver_factory creates | |
| 815 # the utility process side Mojo services in the browser process. | |
| 816 # Ultimately, this will go away when we only support out-of-process. | |
| 817 ":net_utility_services", | |
| 808 ] | 818 ] |
| 809 } | 819 } |
| 810 | 820 |
| 811 source_set("mojo_type_converters") { | 821 source_set("mojo_type_converters") { |
| 812 sources = [ | 822 sources = [ |
| 813 "dns/mojo_type_converters.cc", | 823 "dns/mojo_type_converters.cc", |
| 814 "dns/mojo_type_converters.h", | 824 "dns/mojo_type_converters.h", |
| 815 "proxy/mojo_type_converters.cc", | 825 "proxy/mojo_type_converters.cc", |
| 816 "proxy/mojo_type_converters.h", | 826 "proxy/mojo_type_converters.h", |
| 817 ] | 827 ] |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1397 ":net_utility_services", | 1407 ":net_utility_services", |
| 1398 "//mojo/environment:chromium", | 1408 "//mojo/environment:chromium", |
| 1399 "//third_party/mojo/src/mojo/edk/system", | 1409 "//third_party/mojo/src/mojo/edk/system", |
| 1400 ] | 1410 ] |
| 1401 } else { | 1411 } else { |
| 1402 sources -= [ | 1412 sources -= [ |
| 1403 "dns/host_resolver_mojo_unittest.cc", | 1413 "dns/host_resolver_mojo_unittest.cc", |
| 1404 "dns/mojo_host_resolver_impl_unittest.cc", | 1414 "dns/mojo_host_resolver_impl_unittest.cc", |
| 1405 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", | 1415 "proxy/mojo_proxy_resolver_factory_impl_unittest.cc", |
| 1406 "proxy/mojo_proxy_resolver_impl_unittest.cc", | 1416 "proxy/mojo_proxy_resolver_impl_unittest.cc", |
| 1417 "proxy/mojo_proxy_service_unittest.cc", | |
|
Sam McNally
2015/02/26 06:36:40
proxy_service_mojo_unittest.cc
Anand Mistry (off Chromium)
2015/02/27 03:00:58
Done.
| |
| 1407 ] | 1418 ] |
| 1408 } | 1419 } |
| 1409 | 1420 |
| 1410 if (!enable_mdns) { | 1421 if (!enable_mdns) { |
| 1411 sources -= [ | 1422 sources -= [ |
| 1412 "dns/mdns_cache_unittest.cc", | 1423 "dns/mdns_cache_unittest.cc", |
| 1413 "dns/mdns_client_unittest.cc", | 1424 "dns/mdns_client_unittest.cc", |
| 1414 "dns/record_parsed_unittest.cc", | 1425 "dns/record_parsed_unittest.cc", |
| 1415 "dns/record_rdata_unittest.cc", | 1426 "dns/record_rdata_unittest.cc", |
| 1416 ] | 1427 ] |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1495 "quic/quic_server_bin.cc", | 1506 "quic/quic_server_bin.cc", |
| 1496 ] | 1507 ] |
| 1497 deps = [ | 1508 deps = [ |
| 1498 ":quic_tools", | 1509 ":quic_tools", |
| 1499 ":net", | 1510 ":net", |
| 1500 "//base", | 1511 "//base", |
| 1501 "//third_party/boringssl", | 1512 "//third_party/boringssl", |
| 1502 ] | 1513 ] |
| 1503 } | 1514 } |
| 1504 } # !is_android && !is_win && !is_mac | 1515 } # !is_android && !is_win && !is_mac |
| OLD | NEW |