Remove non-network-service path code in content/!browser.

Bug: 934009
Change-Id: Ia640a3c60f69d607bdf932b090235a5493a1a368
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725425
Commit-Queue: Ken Rockot <rockot@google.com>
Auto-Submit: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#682289}

content/app/content_main_runner_impl.cc

@@ -924,25 +924,23 @@ int ContentMainRunnerImpl::RunServiceManager(MainFunctionParams& main_params,
 
     delegate_->PostTaskSchedulerStart();
 
-    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-      bool force_in_process = false;
-      if (should_start_service_manager_only) {
-        force_in_process = true;
-      } else {
+    bool force_in_process = false;
+    if (should_start_service_manager_only) {
+      force_in_process = true;
+    } else {
 #if defined(OS_ANDROID)
-        auto finch_value = kDevicesForceInProcessParam.Get();
-        auto devices = base::SplitString(
-            finch_value, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-        auto current_device =
-            std::string(base::android::BuildInfo::GetInstance()->model());
-        for (auto device : devices) {
-          if (device == current_device) {
-            force_in_process = true;
-            break;
-          }
+      auto finch_value = kDevicesForceInProcessParam.Get();
+      auto devices = base::SplitString(finch_value, ";", base::TRIM_WHITESPACE,
+                                       base::SPLIT_WANT_NONEMPTY);
+      auto current_device =
+          std::string(base::android::BuildInfo::GetInstance()->model());
+      for (auto device : devices) {
+        if (device == current_device) {
+          force_in_process = true;
+          break;
         }
-#endif
       }
+#endif
 
       if (force_in_process) {
         // This must be called before creating the ServiceManagerContext.

content/public/browser/content_browser_client.cc

@@ -30,7 +30,6 @@
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "services/device/public/cpp/geolocation/location_provider.h"
-#include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "services/service_manager/sandbox/sandbox_type.h"
@@ -791,9 +790,6 @@ network::mojom::NetworkContextPtr ContentBrowserClient::CreateNetworkContext(
     bool in_memory,
     const base::FilePath& relative_partition_path) {
   DCHECK(context);
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return nullptr;
-
   network::mojom::NetworkContextPtr network_context;
   network::mojom::NetworkContextParamsPtr context_params =
       network::mojom::NetworkContextParams::New();

content/public/common/network_service_util.cc

@@ -34,14 +34,10 @@ bool g_force_in_process_network_service = false;
 }  // namespace
 
 bool IsOutOfProcessNetworkService() {
-  return base::FeatureList::IsEnabled(network::features::kNetworkService) &&
-         !IsInProcessNetworkService();
+  return !IsInProcessNetworkService();
 }
 
 bool IsInProcessNetworkService() {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return false;
-
   if (g_force_in_process_network_service ||
       base::FeatureList::IsEnabled(features::kNetworkServiceInProcess) ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(

content/public/test/browser_test_base.cc

@@ -490,7 +490,6 @@ bool BrowserTestBase::AllowFileAccessFromFiles() {
 }
 
 void BrowserTestBase::SimulateNetworkServiceCrash() {
-  CHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
   CHECK(!IsInProcessNetworkService())
       << "Can't crash the network service if it's running in-process!";
   network::mojom::NetworkServiceTestPtr network_service_test;
@@ -602,8 +601,7 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 
     PreRunTestOnMainThread();
     std::unique_ptr<InitialNavigationObserver> initial_navigation_observer;
-    if (initial_web_contents_ &&
-        base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+    if (initial_web_contents_) {
       // Some tests may add host_resolver() rules in their SetUpOnMainThread
       // method and navigate inside of it. This is a best effort to catch that
       // and sync the host_resolver() rules to the network process in that case,

content/public/test/content_mock_cert_verifier.cc

@@ -35,10 +35,8 @@ void ContentMockCertVerifier::CertVerifier::set_default_result(
       switches::kMockCertVerifierDefaultResultForTesting,
       base::NumberToString(default_result));
 
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService) ||
-      IsInProcessNetworkService()) {
+  if (IsInProcessNetworkService())
     return;
-  }
 
   EnsureNetworkServiceTestInitialized();
   mojo::ScopedAllowSyncCallForTesting allow_sync_call;
@@ -59,10 +57,8 @@ void ContentMockCertVerifier::CertVerifier::AddResultForCertAndHost(
     int rv) {
   verifier_->AddResultForCertAndHost(cert, host_pattern, verify_result, rv);
 
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService) ||
-      IsInProcessNetworkService()) {
+  if (IsInProcessNetworkService())
     return;
-  }
 
   EnsureNetworkServiceTestInitialized();
   mojo::ScopedAllowSyncCallForTesting allow_sync_call;

content/public/test/network_service_test_helper.cc

@@ -266,9 +266,6 @@ NetworkServiceTestHelper::~NetworkServiceTestHelper() = default;
 
 void NetworkServiceTestHelper::RegisterNetworkBinders(
     service_manager::BinderRegistry* registry) {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return;
-
   registry->AddInterface(
       base::Bind(&NetworkServiceTestHelper::BindNetworkServiceTestRequest,
                  base::Unretained(this)));

content/public/test/signed_exchange_browser_test_helper.cc

@@ -21,9 +21,6 @@
 #include "net/cert/mock_cert_verifier.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/cert_test_util.h"
-#include "net/test/url_request/url_request_mock_http_job.h"
-#include "net/url_request/url_request_filter.h"
-#include "services/network/public/cpp/features.h"
 
 namespace content {
 
@@ -64,18 +61,12 @@ SignedExchangeBrowserTestHelper::LoadCertificate() {
 void SignedExchangeBrowserTestHelper::InstallUrlInterceptor(
     const GURL& url,
     const std::string& data_path) {
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
-    if (!interceptor_) {
-      interceptor_ = std::make_unique<URLLoaderInterceptor>(base::BindRepeating(
-          &SignedExchangeBrowserTestHelper::OnInterceptCallback,
-          base::Unretained(this)));
-    }
-    interceptor_data_path_map_[url] = data_path;
-  } else {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(&InstallMockInterceptors, url, data_path));
+  if (!interceptor_) {
+    interceptor_ = std::make_unique<URLLoaderInterceptor>(base::BindRepeating(
+        &SignedExchangeBrowserTestHelper::OnInterceptCallback,
+        base::Unretained(this)));
   }
+  interceptor_data_path_map_[url] = data_path;
 }
 
 void SignedExchangeBrowserTestHelper::InstallMockCert(
@@ -98,16 +89,6 @@ void SignedExchangeBrowserTestHelper::InstallMockCertChainInterceptor() {
       "content/test/data/sxg/test.example.org.public.pem.cbor");
 }
 
-void SignedExchangeBrowserTestHelper::InstallMockInterceptors(
-    const GURL& url,
-    const std::string& data_path) {
-  base::FilePath root_path;
-  CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
-  net::URLRequestFilter::GetInstance()->AddUrlInterceptor(
-      url, net::URLRequestMockHTTPJob::CreateInterceptorForSingleFile(
-               root_path.AppendASCII(data_path)));
-}
-
 bool SignedExchangeBrowserTestHelper::OnInterceptCallback(
     URLLoaderInterceptor::RequestParams* params) {
   const auto it = interceptor_data_path_map_.find(params->url_request.url);

content/public/test/signed_exchange_browser_test_helper.h

@@ -72,9 +72,6 @@ class SignedExchangeBrowserTestHelper {
   static const uint64_t kSignatureHeaderExpires;
 
  private:
-  static void InstallMockInterceptors(const GURL& url,
-                                      const std::string& data_path);
-
   bool OnInterceptCallback(URLLoaderInterceptor::RequestParams* params);
 
   std::unique_ptr<URLLoaderInterceptor> interceptor_;

content/shell/browser/shell_content_browser_client.cc

@@ -51,7 +51,6 @@
 #include "net/ssl/client_cert_identity.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "services/network/public/cpp/features.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "services/service_manager/public/cpp/manifest.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
@@ -495,10 +494,6 @@ ShellContentBrowserClient::CreateNetworkContext(
     BrowserContext* context,
     bool in_memory,
     const base::FilePath& relative_partition_path) {
-  DCHECK(context);
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return nullptr;
-
   network::mojom::NetworkContextPtr network_context;
   network::mojom::NetworkContextParamsPtr context_params =
       network::mojom::NetworkContextParams::New();

content/utility/utility_service_factory.cc

@@ -27,7 +27,6 @@
 #include "services/data_decoder/data_decoder_service.h"
 #include "services/data_decoder/public/mojom/constants.mojom.h"
 #include "services/network/network_service.h"
-#include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
 #include "services/tracing/public/cpp/tracing_features.h"
 #include "services/tracing/public/mojom/constants.mojom.h"
@@ -154,8 +153,7 @@ void UtilityServiceFactory::RunService(
              !base::FeatureList::IsEnabled(
                  features::kTracingServiceInProcess)) {
     service = std::make_unique<tracing::TracingService>(std::move(request));
-  } else if (service_name == mojom::kNetworkServiceName &&
-             base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+  } else if (service_name == mojom::kNetworkServiceName) {
     // Unlike other services supported by the utility process, the network
     // service runs on the IO thread and never self-terminates.
     GetContentClient()->utility()->RegisterNetworkBinders(