service worker: Remove non-PlzNavigate code around SWProviderHost::web_contents_getter()

The non-PlzNavigate code path is no longer supported.

R=shimazu

Bug: 789577
Change-Id: Id0b61bd9042769d3afdcb78df6913632d833d831
Reviewed-on: https://chromium-review.googlesource.com/885687Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531843}

content/browser/service_worker/service_worker_controllee_request_handler.cc

@@ -323,22 +323,9 @@ void ServiceWorkerControlleeRequestHandler::
   }
   DCHECK(registration.get());
 
-  base::Callback<WebContents*(void)> web_contents_getter;
-  if (IsBrowserSideNavigationEnabled()) {
-    web_contents_getter = provider_host_->web_contents_getter();
-  } else if (provider_host_->process_id() != -1 &&
-             provider_host_->frame_id() != -1) {
-    web_contents_getter = base::Bind(
-        [](int render_process_id, int render_frame_id) {
-          RenderFrameHost* rfh =
-              RenderFrameHost::FromID(render_process_id, render_frame_id);
-          return WebContents::FromRenderFrameHost(rfh);
-        },
-        provider_host_->process_id(), provider_host_->frame_id());
-  }
   if (!GetContentClient()->browser()->AllowServiceWorker(
           registration->pattern(), provider_host_->topmost_frame_url(),
-          resource_context_, web_contents_getter)) {
+          resource_context_, provider_host_->web_contents_getter())) {
     url_job_->FallbackToNetwork();
     TRACE_EVENT_ASYNC_END2(
         "ServiceWorker",

content/browser/service_worker/service_worker_provider_host_unittest.cc

@@ -245,33 +245,23 @@ class ServiceWorkerProviderHostTest : public testing::Test {
       const GURL& document_url,
       const GURL& topmost_frame_url,
       ServiceWorkerRemoteProviderEndpoint* remote_endpoint) {
-    std::unique_ptr<ServiceWorkerProviderHost> host;
-    if (IsBrowserSideNavigationEnabled()) {
-      host = ServiceWorkerProviderHost::PreCreateNavigationHost(
-          helper_->context()->AsWeakPtr(), true,
-          base::Callback<WebContents*(void)>());
-      ServiceWorkerProviderHostInfo info(
-          host->provider_id(), 1 /* route_id */,
-          blink::mojom::ServiceWorkerProviderType::kForWindow,
-          true /* is_parent_frame_secure */);
-      remote_endpoint->BindWithProviderHostInfo(&info);
-      host->CompleteNavigationInitialized(
-          helper_->mock_render_process_id(), std::move(info),
-          helper_
-              ->GetDispatcherHostForProcess(helper_->mock_render_process_id())
-              ->AsWeakPtr());
-    } else {
-      host = CreateProviderHostWithDispatcherHost(
-          helper_->mock_render_process_id(), next_renderer_provided_id_++,
-          helper_->context()->AsWeakPtr(), 1 /* route_id */,
-          helper_->GetDispatcherHostForProcess(
-              helper_->mock_render_process_id()),
-          remote_endpoint);
-    }
+    std::unique_ptr<ServiceWorkerProviderHost> host =
+        ServiceWorkerProviderHost::PreCreateNavigationHost(
+            helper_->context()->AsWeakPtr(), true,
+            base::Callback<WebContents*(void)>());
+    ServiceWorkerProviderHostInfo info(
+        host->provider_id(), 1 /* route_id */,
+        blink::mojom::ServiceWorkerProviderType::kForWindow,
+        true /* is_parent_frame_secure */);
+    remote_endpoint->BindWithProviderHostInfo(&info);
+    host->CompleteNavigationInitialized(
+        helper_->mock_render_process_id(), std::move(info),
+        helper_->GetDispatcherHostForProcess(helper_->mock_render_process_id())
+            ->AsWeakPtr());
 
-    ServiceWorkerProviderHost* host_raw = host.get();
     host->SetDocumentUrl(document_url);
     host->SetTopmostFrameUrl(topmost_frame_url);
+    ServiceWorkerProviderHost* host_raw = host.get();
     context_->AddProviderHost(std::move(host));
     return host_raw;
   }