Revert of Allow use of Mojo/V8 ProxyResolvers with URLRequestContextBuilder.

net/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 18 matching lines @@
 
 # The way the cache uses mmap() is inefficient on some Android devices. If
 # this flag is set, we hackily avoid using mmap() in the disk cache. We are
 # pretty confident that mmap-ing the index would not hurt any existing x86
 # android devices, but we cannot be so sure about the variety of ARM devices.
 # So enable it for x86 only for now.
 posix_avoid_mmap = is_android && current_cpu != "x86"
 
 use_v8_in_net = !is_ios && !is_proto_quic
 enable_built_in_dns = !is_ios && !is_proto_quic
-enable_net_mojo = !is_ios && !is_android && !is_proto_quic
 
 # True if certificates are represented with DER byte buffers. This can be true
 # in addition to use_openssl_certs or use_nss_certs, in that case byte certs
 # are used internally but OpenSSL or NSS are used for certificate verification.
 # TODO(mattm): crbug.com/671420: Implement and enable this for all platforms.
 use_byte_certs = is_mac || is_android || is_nacl || is_ios
 
 buildflag_header("features") {
   header = "net_features.h"
   flags = [
@@ skipping 2436 matching lines @@
     "test/embedded_test_server/embedded_test_server.h",
     "test/embedded_test_server/embedded_test_server_connection_listener.h",
     "test/embedded_test_server/http_connection.cc",
     "test/embedded_test_server/http_connection.h",
     "test/embedded_test_server/http_request.cc",
     "test/embedded_test_server/http_request.h",
     "test/embedded_test_server/http_response.cc",
     "test/embedded_test_server/http_response.h",
     "test/embedded_test_server/request_handler_util.cc",
     "test/embedded_test_server/request_handler_util.h",
-    "test/embedded_test_server/simple_connection_listener.cc",
-    "test/embedded_test_server/simple_connection_listener.h",
     "test/event_waiter.h",
     "test/gtest_util.h",
     "test/net_test_suite.cc",
     "test/net_test_suite.h",
     "test/python_utils.cc",
     "test/python_utils.h",
     "test/scoped_disable_exit_on_dfatal.cc",
     "test/scoped_disable_exit_on_dfatal.h",
     "test/test_certificate_data.h",
     "test/test_data_directory.cc",
@@ skipping 122 matching lines @@
     ]
     deps = [
       "//base",
       "//gin",
       "//url",
       "//v8",
     ]
   }
 }
 
-if (enable_net_mojo) {
+if (!is_ios && !is_android && !is_proto_quic) {
   source_set("net_browser_services") {
     sources = [
       "dns/mojo_host_resolver_impl.cc",
       "dns/mojo_host_resolver_impl.h",
       "proxy/mojo_proxy_resolver_factory.h",
       "proxy/proxy_resolver_factory_mojo.cc",
       "proxy/proxy_resolver_factory_mojo.h",
       "proxy/proxy_service_mojo.cc",
       "proxy/proxy_service_mojo.h",
     ]
@@ skipping 23 matching lines @@
     ]
 
     public_deps = [
       ":net",
       "//mojo/public/cpp/bindings",
       "//net/interfaces",
     ]
   }
 }
 
-if (use_v8_in_net) {
-  source_set("net_context_builder_with_v8") {
-    sources = [
-      "url_request/url_request_context_builder_v8.cc",
-      "url_request/url_request_context_builder_v8.h",
-    ]
-
-    defines = []
-
-    deps = [
-      ":net",
-      ":net_with_v8",
-      "//base",
-    ]
-
-    if (enable_net_mojo) {
-      deps += [
-        ":net_browser_services",
-        "//mojo/public/cpp/bindings",
-        "//net/interfaces",
-      ]
-
-      defines += [ "ENABLE_NET_MOJO" ]
-    }
-  }
-}
-
 if (!is_ios && !is_android) {
   executable("cert_verify_tool") {
     testonly = true
     sources = [
       "tools/cert_verify_tool/cert_verify_tool.cc",
       "tools/cert_verify_tool/cert_verify_tool_util.cc",
       "tools/cert_verify_tool/cert_verify_tool_util.h",
       "tools/cert_verify_tool/verify_using_cert_verify_proc.cc",
       "tools/cert_verify_tool/verify_using_cert_verify_proc.h",
       "tools/cert_verify_tool/verify_using_path_builder.cc",
@@ skipping 1859 matching lines @@
     "proxy/proxy_list_unittest.cc",
     "proxy/proxy_resolver_factory_mojo_unittest.cc",
     "proxy/proxy_resolver_v8_tracing_unittest.cc",
     "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc",
     "proxy/proxy_resolver_v8_unittest.cc",
     "proxy/proxy_script_decider_unittest.cc",
     "proxy/proxy_script_fetcher_impl_unittest.cc",
     "proxy/proxy_server_unittest.cc",
     "proxy/proxy_service_mojo_unittest.cc",
     "proxy/proxy_service_unittest.cc",
-    "proxy/test_mojo_proxy_resolver_factory.cc",
-    "proxy/test_mojo_proxy_resolver_factory.h",
     "quic/chromium/bidirectional_stream_quic_impl_unittest.cc",
     "quic/chromium/crypto/proof_test_chromium.cc",
     "quic/chromium/crypto/proof_verifier_chromium_test.cc",
     "quic/chromium/crypto_test_utils_chromium.cc",
     "quic/chromium/mock_crypto_client_stream_factory.cc",
     "quic/chromium/mock_crypto_client_stream_factory.h",
     "quic/chromium/mock_quic_data.cc",
     "quic/chromium/mock_quic_data.h",
     "quic/chromium/network_connection_unittest.cc",
     "quic/chromium/properties_based_quic_server_info_test.cc",
@@ skipping 316 matching lines @@
     "tools/content_decoder_tool/content_decoder_tool_unittest.cc",
     "tools/quic/quic_simple_client_test.cc",
     "tools/quic/test_tools/mock_quic_session_visitor.cc",
     "tools/quic/test_tools/mock_quic_session_visitor.h",
     "tools/tld_cleanup/tld_cleanup_util_unittest.cc",
     "url_request/report_sender_unittest.cc",
     "url_request/sdch_dictionary_fetcher_unittest.cc",
     "url_request/url_fetcher_impl_unittest.cc",
     "url_request/url_fetcher_response_writer_unittest.cc",
     "url_request/url_request_context_builder_unittest.cc",
-    "url_request/url_request_context_builder_v8_unittest.cc",
     "url_request/url_request_context_unittest.cc",
     "url_request/url_request_data_job_unittest.cc",
     "url_request/url_request_file_dir_job_unittest.cc",
     "url_request/url_request_file_job_unittest.cc",
     "url_request/url_request_filter_unittest.cc",
     "url_request/url_request_ftp_job_unittest.cc",
     "url_request/url_request_http_job_unittest.cc",
     "url_request/url_request_job_factory_impl_unittest.cc",
     "url_request/url_request_job_unittest.cc",
     "url_request/url_request_quic_unittest.cc",
@@ skipping 239 matching lines @@
   }
 
   if (!enable_built_in_dns) {
     sources -= [
       "dns/address_sorter_posix_unittest.cc",
       "dns/address_sorter_unittest.cc",
     ]
   }
 
   if (use_v8_in_net) {
-    deps += [
-      ":net_context_builder_with_v8",
-      ":net_with_v8",
-    ]
+    deps += [ ":net_with_v8" ]
   } else {
     sources -= [
       "proxy/proxy_resolver_v8_tracing_unittest.cc",
       "proxy/proxy_resolver_v8_tracing_wrapper_unittest.cc",
       "proxy/proxy_resolver_v8_unittest.cc",
-      "url_request/url_request_context_builder_v8_unittest.cc",
     ]
   }
 
-  if (enable_net_mojo) {
+  if (use_v8_in_net && !is_android) {
     deps += [
       ":net_browser_services",
       ":net_utility_services",
       "//mojo/edk/system",
     ]
-
-    defines += [ "ENABLE_NET_MOJO" ]
   } else {
     sources -= [
       "dns/host_resolver_mojo_unittest.cc",
       "dns/mojo_host_resolver_impl_unittest.cc",
       "proxy/mojo_proxy_resolver_factory_impl_unittest.cc",
       "proxy/mojo_proxy_resolver_impl_unittest.cc",
       "proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc",
       "proxy/proxy_resolver_factory_mojo_unittest.cc",
       "proxy/proxy_service_mojo_unittest.cc",
-      "proxy/test_mojo_proxy_resolver_factory.cc",
-      "proxy/test_mojo_proxy_resolver_factory.h",
     ]
   }
 
   if (!enable_mdns) {
     sources -= [
       "dns/mdns_cache_unittest.cc",
       "dns/mdns_client_unittest.cc",
     ]
   }
 
@@ skipping 704 matching lines @@
   ]
   deps = [
     ":net_fuzzer_test_support",
     ":test_support",
     "//base",
     "//net",
   ]
   dict = "data/fuzzer_dictionaries/net_spdy_session_fuzzer.dict"
   seed_corpus = "data/fuzzer_data/net_spdy_session_fuzzer/"
 }