[AW] Remove non-network-service path code in android_webview/renderer

Remove code that is not used anymore with the network service enabled.

BUG=989104

Change-Id: If77bd19df957e6cb34f165cdafbe87a5e72c1fda
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1731932Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Tim Volodine <timvolodine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683634}

android_webview/renderer/aw_url_loader_throttle_provider.cc

@@ -12,7 +12,6 @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_thread.h"
-#include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace android_webview {
@@ -22,12 +21,9 @@ AwURLLoaderThrottleProvider::AwURLLoaderThrottleProvider(
     : type_(type) {
   DETACH_FROM_THREAD(thread_checker_);
 
-  if (base::FeatureList::IsEnabled(network::features::kNetworkService) ||
-      base::FeatureList::IsEnabled(safe_browsing::kCheckByURLLoaderThrottle)) {
   content::RenderThread::Get()->GetConnector()->BindInterface(
       content::mojom::kBrowserServiceName,
       mojo::MakeRequest(&safe_browsing_info_));
-  }
 }
 
 AwURLLoaderThrottleProvider::AwURLLoaderThrottleProvider(
@@ -59,8 +55,6 @@ AwURLLoaderThrottleProvider::CreateThrottles(
 
   std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles;
 
-  bool network_service_enabled =
-      base::FeatureList::IsEnabled(network::features::kNetworkService);
   // Some throttles have already been added in the browser for frame resources.
   // Don't add them for frame requests.
   bool is_frame_resource = content::IsResourceTypeFrame(resource_type);
@@ -68,10 +62,7 @@ AwURLLoaderThrottleProvider::CreateThrottles(
   DCHECK(!is_frame_resource ||
          type_ == content::URLLoaderThrottleProviderType::kFrame);
 
-  if ((network_service_enabled ||
-       base::FeatureList::IsEnabled(
-           safe_browsing::kCheckByURLLoaderThrottle)) &&
-      !is_frame_resource) {
+  if (!is_frame_resource) {
     if (safe_browsing_info_)
       safe_browsing_.Bind(std::move(safe_browsing_info_));
     throttles.push_back(

android_webview/renderer/aw_websocket_handshake_throttle_provider.cc

@@ -12,7 +12,6 @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_thread.h"
-#include "services/network/public/cpp/features.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/blink/public/platform/websocket_handshake_throttle.h"
 
@@ -20,8 +19,6 @@ namespace android_webview {
 
 AwWebSocketHandshakeThrottleProvider::AwWebSocketHandshakeThrottleProvider() {
   DETACH_FROM_THREAD(thread_checker_);
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return;
   content::RenderThread::Get()->GetConnector()->BindInterface(
       content::mojom::kBrowserServiceName,
       mojo::MakeRequest(&safe_browsing_info_));
@@ -52,8 +49,6 @@ AwWebSocketHandshakeThrottleProvider::CreateThrottle(
     int render_frame_id,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
-    return nullptr;
   if (safe_browsing_info_)
     safe_browsing_.Bind(std::move(safe_browsing_info_), std::move(task_runner));
   return std::make_unique<safe_browsing::WebSocketSBHandshakeThrottle>(