net_patch.diff

diff --git a/BUILD.gn b/BUILD.gn
index 85cfe20..bac2450 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -44,7 +44,7 @@ posix_avoid_mmap = is_android && current_cpu != "x86"
 
 # WebSockets and socket stream code are used everywhere except iOS.
 enable_websockets = !is_ios
-use_v8_in_net = !is_ios
+use_v8_in_net = false
 enable_built_in_dns = !is_ios
 disable_ftp_support = is_ios
 
@@ -524,16 +524,6 @@ proto_library("net_quic_proto") {
   extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
-static_library("extras") {
-  sources = gypi_values.net_extras_sources
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-  deps = [
-    ":net",
-    "//base",
-    "//sql:sql",
-  ]
-}
-
 static_library("http_server") {
   sources = [
     "server/http_connection.cc",
@@ -1300,7 +1290,6 @@ if (!is_android && !is_mac) {
 
     deps = [
       ":balsa",
-      ":extras",
       ":http_server",
       ":net",
       ":simple_quic_tools",
@@ -1313,9 +1302,7 @@ if (!is_android && !is_mac) {
       "//crypto",
       "//crypto:platform",
       "//crypto:test_support",
-      "//gin",
       "//net/base/registry_controlled_domains",
-      "//sql",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/zlib",
@@ -1592,7 +1579,6 @@ executable("net_perftests") {
     "base/mime_sniffer_perftest.cc",
     "cookies/cookie_monster_perftest.cc",
     "disk_cache/blockfile/disk_cache_perftest.cc",
-    "extras/sqlite/sqlite_persistent_cookie_store_perftest.cc",
     "proxy/proxy_resolver_perftest.cc",
     "udp/udp_socket_perftest.cc",
   ]
@@ -1605,7 +1591,6 @@ executable("net_perftests") {
     "//base/test:test_support_perf",
     "//testing/gtest",
     "//url",
-    ":extras",
     ":net",
     ":test_support",
   ]
diff --git a/net.gypi b/net.gypi
index 87b8e8d..f2936e6 100644
--- a/net.gypi
+++ b/net.gypi
@@ -1391,8 +1391,6 @@
       'dns/record_rdata_unittest.cc',
       'dns/serial_worker_unittest.cc',
       'dns/single_request_host_resolver_unittest.cc',
-      'extras/sqlite/sqlite_channel_id_store_unittest.cc',
-      'extras/sqlite/sqlite_persistent_cookie_store_unittest.cc',
       'filter/filter_unittest.cc',
       'filter/gzip_filter_unittest.cc',
       'filter/mock_filter_context.cc',
diff --git a/test/run_all_unittests.cc b/test/run_all_unittests.cc
index 25016ca..6cd8e4c 100644
--- a/test/run_all_unittests.cc
+++ b/test/run_all_unittests.cc
@@ -19,10 +19,6 @@
 #include "url/android/url_jni_registrar.h"
 #endif
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
-#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"
-#endif
-
 using net::internal::ClientSocketPoolBaseHelper;
 using net::SpdySession;
 
@@ -57,10 +53,6 @@ int main(int argc, char** argv) {
   // single-threaded.
   net::EnableSSLServerSockets();
 
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
-  mojo::embedder::test::InitWithSimplePlatformSupport();
-#endif
-
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&NetTestSuite::Run,
                              base::Unretained(&test_suite)));