PlzNavigate: Fix ServiceWorkerHandler not finding WebContents.

content/browser/devtools/protocol/service_worker_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/background_sync/background_sync_context.h"
@@ skipping 353 matching lines @@
 void ServiceWorkerHandler::OnWorkerVersionUpdated(
     const std::vector<ServiceWorkerVersionInfo>& versions) {
   using Version = ServiceWorker::ServiceWorkerVersion;
   std::unique_ptr<protocol::Array<Version>> result =
       protocol::Array<Version>::create();
   for (const auto& version : versions) {
     std::unique_ptr<protocol::Array<std::string>> clients =
         protocol::Array<std::string>::create();
     for (const auto& client : version.clients) {
       if (client.second.type == SERVICE_WORKER_PROVIDER_FOR_WINDOW) {
-        RenderFrameHostImpl* render_frame_host = RenderFrameHostImpl::FromID(
-            client.second.process_id, client.second.route_id);
+        // PlzNavigate: a navigation may not yet be associated with a
+        // RenderFrameHost. The |web_contents_getter| has been introduced for
+        // getting the WebContents with PlzNavigate without using the
+        // RenderFrameHost.
+        // See https://crbug.com/725818.
         WebContents* web_contents =
-            WebContents::FromRenderFrameHost(render_frame_host);
+            client.second.web_contents_getter
+                ? client.second.web_contents_getter.Run()
+                : WebContents::FromRenderFrameHost(RenderFrameHostImpl::FromID(
+                      client.second.process_id, client.second.route_id));
         // There is a possibility that the frame is already deleted
         // because of the thread hopping.
         if (!web_contents)
           continue;
         clients->addItem(
             DevToolsAgentHost::GetOrCreateFor(web_contents)->GetId());
       } else if (client.second.type ==
                  SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER) {
         scoped_refptr<DevToolsAgentHost> agent_host(
             DevToolsAgentHost::GetForWorker(client.second.process_id,
@@ skipping 43 matching lines @@
           .Build());
 }
 
 void ServiceWorkerHandler::ClearForceUpdate() {
   if (context_)
     context_->SetForceUpdateOnPageLoad(false);
 }
 
 }  // namespace protocol
 }  // namespace content