Remove the old network implementation (see issue #2622)

The `--disable-features=NetworkService` flag is no longer supported.

Author: magreenblatt

BUILD.gn

@@ -371,37 +371,15 @@ static_library("libcef_static") {
     "libcef/browser/navigate_params.h",
     "libcef/browser/navigation_entry_impl.cc",
     "libcef/browser/navigation_entry_impl.h",
-    "libcef/browser/net/browser_urlrequest_old_impl.cc",
-    "libcef/browser/net/browser_urlrequest_old_impl.h",
     "libcef/browser/net/chrome_scheme_handler.cc",
     "libcef/browser/net/chrome_scheme_handler.h",
-    "libcef/browser/net/cookie_manager_old_impl.cc",
-    "libcef/browser/net/cookie_manager_old_impl.h",
     "libcef/browser/net/crlset_file_util_impl.cc",
     "libcef/browser/net/devtools_scheme_handler.cc",
     "libcef/browser/net/devtools_scheme_handler.h",
     "libcef/browser/net/internal_scheme_handler.cc",
     "libcef/browser/net/internal_scheme_handler.h",
-    "libcef/browser/net/net_util.cc",
-    "libcef/browser/net/net_util.h",
-    "libcef/browser/net/network_delegate.cc",
-    "libcef/browser/net/network_delegate.h",
-    "libcef/browser/net/resource_request_job.cc",
-    "libcef/browser/net/resource_request_job.h",
     "libcef/browser/net/scheme_handler.cc",
     "libcef/browser/net/scheme_handler.h",
-    "libcef/browser/net/source_stream.cc",
-    "libcef/browser/net/source_stream.h",
-    "libcef/browser/net/url_request_context.cc",
-    "libcef/browser/net/url_request_context.h",
-    "libcef/browser/net/url_request_context_getter.cc",
-    "libcef/browser/net/url_request_context_getter.h",
-    "libcef/browser/net/url_request_interceptor.cc",
-    "libcef/browser/net/url_request_interceptor.h",
-    "libcef/browser/net/url_request_manager.cc",
-    "libcef/browser/net/url_request_manager.h",
-    "libcef/browser/net/url_request_user_data.cc",
-    "libcef/browser/net/url_request_user_data.h",
     "libcef/browser/net_service/browser_urlrequest_impl.cc",
     "libcef/browser/net_service/browser_urlrequest_impl.h",
     "libcef/browser/net_service/cookie_helper.cc",
@@ -462,8 +440,6 @@ static_library("libcef_static") {
     "libcef/browser/process_util_impl.cc",
     "libcef/browser/resource_context.cc",
     "libcef/browser/resource_context.h",
-    "libcef/browser/resource_dispatcher_host_delegate.cc",
-    "libcef/browser/resource_dispatcher_host_delegate.h",
     "libcef/browser/request_context_impl.cc",
     "libcef/browser/request_context_impl.h",
     "libcef/browser/scheme_impl.cc",
@@ -538,8 +514,6 @@ static_library("libcef_static") {
     "libcef/common/net/upload_element.h",
     "libcef/common/net_service/net_service_util.cc",
     "libcef/common/net_service/net_service_util.h",
-    "libcef/common/net_service/util.cc",
-    "libcef/common/net_service/util.h",
     "libcef/common/parser_impl.cc",
     "libcef/common/process_message_impl.cc",
     "libcef/common/process_message_impl.h",

libcef/browser/browser_context.cc

@@ -17,7 +17,6 @@
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_switches.h"
 #include "libcef/common/extensions/extensions_util.h"
-#include "libcef/common/net_service/util.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ -245,7 +244,7 @@ CefBrowserContext::~CefBrowserContext() {
 
   if (resource_context_.get()) {
     // Destruction of the ResourceContext will trigger destruction of all
-    // associated URLRequests.
+    // associated network requests.
     content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE,
                                        resource_context_.release());
   }
@@ -258,8 +257,6 @@ CefBrowserContext::~CefBrowserContext() {
 
   pref_proxy_config_tracker_->DetachFromPrefService();
 
-  if (url_request_getter_)
-    url_request_getter_->ShutdownOnUIThread();
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
@@ -352,15 +349,6 @@ void CefBrowserContext::Initialize() {
 
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       this, resource_context_.get());
-
-  if (!net_service::IsEnabled()) {
-    // Create the CefURLRequestContextGetter via an indirect call to
-    // CreateRequestContext. Triggers a call to CefURLRequestContextGetter::
-    // GetURLRequestContext() on the IO thread which creates the
-    // CefURLRequestContext.
-    GetRequestContext();
-    DCHECK(url_request_getter_.get());
-  }
 }
 
 void CefBrowserContext::AddCefRequestContext(CefRequestContextImpl* context) {
@@ -410,9 +398,8 @@ CefBrowserContext::GetClientHintsControllerDelegate() {
 }
 
 net::URLRequestContextGetter* CefBrowserContext::GetRequestContext() {
-  CEF_REQUIRE_UIT();
-  DCHECK(!net_service::IsEnabled());
-  return GetDefaultStoragePartition(this)->GetURLRequestContext();
+  NOTREACHED() << "NetworkService is required";
+  return nullptr;
 }
 
 net::URLRequestContextGetter* CefBrowserContext::CreateMediaRequestContext() {
@@ -519,37 +506,8 @@ CefBrowserContext::GetBrowsingDataRemoverDelegate() {
 net::URLRequestContextGetter* CefBrowserContext::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
-  CEF_REQUIRE_UIT();
-  DCHECK(!net_service::IsEnabled());
-  DCHECK(!url_request_getter_.get());
-
-  auto io_thread_runner =
-      base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO});
-
-  // Initialize the proxy configuration service.
-  // TODO(cef): Determine if we can use the Chrome/Mojo implementation from
-  // https://crrev.com/d0d0d050
-  std::unique_ptr<net::ProxyConfigService> base_service(
-      net::ProxyResolutionService::CreateSystemProxyConfigService(
-          io_thread_runner));
-  std::unique_ptr<net::ProxyConfigService> proxy_config_service(
-      pref_proxy_config_tracker_->CreateTrackingProxyConfigService(
-          std::move(base_service)));
-
-  if (extensions::ExtensionsEnabled()) {
-    // Handle only chrome-extension:// requests. CEF does not support
-    // chrome-extension-resource:// requests (it does not store shared extension
-    // data in its installation directory).
-    extensions::InfoMap* extension_info_map = extension_system()->info_map();
-    (*protocol_handlers)[extensions::kExtensionScheme] =
-        extensions::CreateExtensionProtocolHandler(IsOffTheRecord(),
-                                                   extension_info_map);
-  }
-
-  url_request_getter_ = new CefURLRequestContextGetter(
-      settings_, GetPrefs(), io_thread_runner, protocol_handlers,
-      std::move(proxy_config_service), std::move(request_interceptors));
-  return url_request_getter_.get();
+  NOTREACHED() << "NetworkService is required";
+  return nullptr;
 }
 
 net::URLRequestContextGetter*
@@ -742,7 +700,6 @@ void CefBrowserContext::ClearSchemeHandlerFactories() {
 
 network::mojom::NetworkContext* CefBrowserContext::GetNetworkContext() {
   CEF_REQUIRE_UIT();
-  DCHECK(net_service::IsEnabled());
   return GetDefaultStoragePartition(this)->GetNetworkContext();
 }
 

libcef/browser/browser_context.h

@@ -8,7 +8,6 @@
 
 #include "include/cef_request_context_handler.h"
 #include "libcef/browser/chrome_profile_stub.h"
-#include "libcef/browser/net/url_request_context_getter.h"
 #include "libcef/browser/resource_context.h"
 
 #include "base/files/file_path.h"
@@ -47,33 +46,23 @@
 //   controlled indirectly by BC.
 //
 // RC = CefResourceContext
-//   Acts as a bridge for resource loading. URLRequest life span is tied to this
-//   object. Must be destroyed before the associated URCG. Life span is
+//   Acts as a bridge for resource loading. Network request life span is tied to
+//   this object. Must be destroyed before the associated URCG. Life span is
 //   controlled by BC.
 //
-// URCG = CefURLRequestContextGetter
-//   Creates and owns the URC. Created by StoragePartitionImplMap::Get()
-//   calling BC::CreateRequestContext(). Life span is controlled by RC and (for
-//   the global context) CefBrowserMainParts, and SPI.
-//
-// URC = CefURLRequestContext
-//   Owns various network-related objects including the isolated cookie manager.
-//   Owns URLRequest objects which must be destroyed first. Life span is
-//   controlled by URCG.
-//
 //
 // Relationship diagram:
 //   ref = reference (CefRefPtr/scoped_refptr)
 //   own = ownership (std::unique_ptr)
 //   ptr = raw pointer
 //
-//                     CefBrowserMainParts--\   isolated cookie manager, etc.
-//                       |                   \             ^
-//                      own                  ref        ref/own
-//                       v                    v            |
-// BHI -own-> WC -ptr-> BC -own-> SPI -ref-> URCG --own-> URC
+//               CefBrowserMainParts
+//                       |
+//                      own
+//                       v
+// BHI -own-> WC -ptr-> BC -own-> SPI
 //
-// BHI -ref-> RCI -own-> BC -own-> RC -ref-> URCG
+// BHI -ref-> RCI -own-> BC -own-> RC
 //
 //
 // How shutdown works:
@@ -86,13 +75,7 @@
 //    CefBrowserMainParts::PostMainMessageLoopRun().
 // 4. CefResourceContext is destroyed asynchronously on the IO thread due to
 //    CefBrowserContext destruction. This cancels/destroys any pending
-//    URLRequests.
-// 5. CefURLRequestContextGetter is destroyed asynchronously on the IO thread
-//    due to CefResourceContext destruction (or ref release in
-//    CefBrowserMainParts::PostMainMessageLoopRun. This may be delayed if other
-//    network-related objects still have a reference to it.
-// 6. CefURLRequestContext is destroyed on the IO thread due to
-//    CefURLRequestContextGetter destruction.
+//    network requests.
 */
 
 class CefDownloadManagerDelegate;
@@ -256,11 +239,6 @@ class CefBrowserContext : public ChromeProfileStub,
     return extension_system_;
   }
 
-  // Guaranteed to exist once this object has been initialized.
-  scoped_refptr<CefURLRequestContextGetter> request_context_getter() const {
-    return url_request_getter_;
-  }
-
   // Called from DownloadPrefs::FromBrowserContext.
   DownloadPrefs* GetDownloadPrefs();
 
@@ -284,7 +262,6 @@ class CefBrowserContext : public ChromeProfileStub,
   std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   std::unique_ptr<CefDownloadManagerDelegate> download_manager_delegate_;
-  scoped_refptr<CefURLRequestContextGetter> url_request_getter_;
   std::unique_ptr<CefSSLHostStateDelegate> ssl_host_state_delegate_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   std::unique_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;

libcef/browser/browser_main.cc

@@ -22,7 +22,6 @@
 #include "libcef/common/extensions/extensions_client.h"
 #include "libcef/common/extensions/extensions_util.h"
 #include "libcef/common/net/net_resource_provider.h"
-#include "libcef/common/net_service/util.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ -128,12 +127,10 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
 #endif
 
 #if defined(OS_MACOSX)
-  if (net_service::IsEnabled()) {
-    // Initialize the OSCrypt.
-    PrefService* local_state = g_browser_process->local_state();
-    DCHECK(local_state);
-    OSCrypt::Init(local_state);
-  }
+  // Initialize the OSCrypt.
+  PrefService* local_state = g_browser_process->local_state();
+  DCHECK(local_state);
+  OSCrypt::Init(local_state);
 #endif
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
@@ -162,10 +159,7 @@ int CefBrowserMainParts::PreCreateThreads() {
   // Initialize these objects before IO access restrictions are applied and
   // before the IO thread is started.
   content::GpuDataManager::GetInstance();
-  if (net_service::IsEnabled()) {
-    SystemNetworkContextManager::CreateInstance(
-        g_browser_process->local_state());
-  }
+  SystemNetworkContextManager::CreateInstance(g_browser_process->local_state());
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreCreateThreads();

libcef/browser/browser_main.h

@@ -6,15 +6,13 @@
 #define CEF_LIBCEF_BROWSER_BROWSER_MAIN_H_
 #pragma once
 
-#include "libcef/browser/net/url_request_context_getter.h"
 #include "libcef/browser/request_context_impl.h"
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_main_parts.h"
-#include "net/url_request/url_request_context_getter.h"
 
 namespace content {
 struct MainFunctionParams;

libcef/browser/chrome_browser_process_stub.cc

@@ -11,7 +11,6 @@
 #include "libcef/browser/prefs/browser_prefs.h"
 #include "libcef/browser/thread_util.h"
 #include "libcef/common/cef_switches.h"
-#include "libcef/common/net_service/util.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/net/system_network_context_manager.h"
@@ -21,7 +20,6 @@
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/ui/prefs/pref_watcher.h"
 #include "components/net_log/chrome_net_log.h"
-#include "components/net_log/net_export_file_writer.h"
 #include "components/prefs/pref_service.h"
 #include "content/browser/startup_helper.h"
 #include "content/public/common/content_switches.h"
@@ -79,7 +77,7 @@ void ChromeBrowserProcessStub::Shutdown() {
   profile_manager_.reset();
   event_router_forwarder_ = nullptr;
 
-  if (net_service::IsEnabled() && SystemNetworkContextManager::GetInstance()) {
+  if (SystemNetworkContextManager::GetInstance()) {
     SystemNetworkContextManager::DeleteInstance();
   }
 
@@ -145,14 +143,6 @@ ChromeBrowserProcessStub::system_network_context_manager() {
   return SystemNetworkContextManager::GetInstance();
 }
 
-net_log::NetExportFileWriter*
-ChromeBrowserProcessStub::net_export_file_writer() {
-  if (!net_export_file_writer_) {
-    net_export_file_writer_ = std::make_unique<net_log::NetExportFileWriter>();
-  }
-  return net_export_file_writer_.get();
-}
-
 network::NetworkQualityTracker*
 ChromeBrowserProcessStub::network_quality_tracker() {
   NOTREACHED();

libcef/browser/chrome_browser_process_stub.h

@@ -47,7 +47,6 @@ class ChromeBrowserProcessStub : public BrowserProcess {
   rappor::RapporServiceImpl* rappor_service() override;
   IOThread* io_thread() override;
   SystemNetworkContextManager* system_network_context_manager() override;
-  net_log::NetExportFileWriter* net_export_file_writer() override;
   network::NetworkQualityTracker* network_quality_tracker() override;
   WatchDogThread* watchdog_thread() override;
   ProfileManager* profile_manager() override;
@@ -122,7 +121,6 @@ class ChromeBrowserProcessStub : public BrowserProcess {
       print_preview_dialog_controller_;
   std::unique_ptr<printing::BackgroundPrintingManager>
       background_printing_manager_;
-  std::unique_ptr<net_log::NetExportFileWriter> net_export_file_writer_;
   std::unique_ptr<PrefService> local_state_;
   // Must be destroyed after |local_state_|.
   std::unique_ptr<policy::ChromeBrowserPolicyConnector>

libcef/browser/chrome_profile_stub.cc

@@ -72,11 +72,8 @@ PrefService* ChromeProfileStub::GetOffTheRecordPrefs() {
 
 base::OnceCallback<net::CookieStore*()>
 ChromeProfileStub::GetExtensionsCookieStoreGetter() {
-  return base::BindOnce(
-      [](scoped_refptr<net::URLRequestContextGetter> context) {
-        return context->GetURLRequestContext()->cookie_store();
-      },
-      base::WrapRefCounted(GetRequestContext()));
+  NOTREACHED();
+  return base::OnceCallback<net::CookieStore*()>();
 }
 
 bool ChromeProfileStub::IsSameProfile(Profile* profile) {