[ServiceWorker] Fix bugs of wpt tests for Client.navigate

content/browser/service_worker/service_worker_client_utils.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/service_worker/service_worker_client_utils.h"
 
 #include <algorithm>
 #include <tuple>
 
 #include "base/location.h"
@@ skipping 41 matching lines @@
  public:
   OpenURLObserver(WebContents* web_contents,
                   int frame_tree_node_id,
                   const OpenURLCallback& callback)
       : WebContentsObserver(web_contents),
         frame_tree_node_id_(frame_tree_node_id),
         callback_(callback) {}
 
   void DidFinishNavigation(NavigationHandle* navigation_handle) override {
     DCHECK(web_contents());
-    if (!navigation_handle->HasCommitted())
+    if (!navigation_handle->HasCommitted()) {
+      // Return error.
+      RunCallback(ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE);
       return;
+    }
 
-    if (navigation_handle->GetFrameTreeNodeId() != frame_tree_node_id_)
+    if (navigation_handle->GetFrameTreeNodeId() != frame_tree_node_id_) {
+      // Return error.
+      RunCallback(ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE);
       return;
+    }
 
     RenderFrameHost* render_frame_host =
         navigation_handle->GetRenderFrameHost();
     RunCallback(render_frame_host->GetProcess()->GetID(),
                 render_frame_host->GetRoutingID());
   }
 
   void RenderProcessGone(base::TerminationStatus status) override {
     RunCallback(ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE);
   }
@@ skipping 459 matching lines @@
       options.client_type == blink::kWebServiceWorkerClientTypeAll) {
     GetWindowClients(controller, options, callback, std::move(clients));
     return;
   }
 
   GetNonWindowClients(controller, options, callback, std::move(clients));
 }
 
 }  // namespace service_worker_client_utils
 }  // namespace content