Add two interfaces for ServiceWorkerProviderContext/ProviderHost

content/browser/service_worker/service_worker_provider_host.cc

 // Copyright 2013 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_provider_host.h"
 
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/guid.h"
@@ skipping 43 matching lines @@
       ResourceType resource_type)
       : ServiceWorkerRequestHandler(context,
                                     provider_host,
                                     blob_storage_context,
                                     resource_type) {}
   ~ServiceWorkerURLTrackingRequestHandler() override {}
 
   // Called via custom URLRequestJobFactory.
   net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate,
-      ResourceContext* resource_context) override {
+      net::NetworkDelegate* /* network_delegate */,
+      ResourceContext* /* resource_context */) override {
     // |provider_host_| may have been deleted when the request is resumed.
     if (!provider_host_)
       return nullptr;
     const GURL stripped_url = net::SimplifyUrlForRequest(request->url());
     provider_host_->SetDocumentUrl(stripped_url);
     provider_host_->SetTopmostFrameUrl(request->first_party_for_cookies());
     return nullptr;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerURLTrackingRequestHandler);
 };
 
+void RemoveProviderHost(base::WeakPtr<ServiceWorkerContextCore> context,
+                        int process_id,
+                        int provider_id) {
+  TRACE_EVENT0("ServiceWorker",
+               "ServiceWorkerProviderHost::RemoveProviderHost");
+  if (!context)
+    return;
+  if (!context->GetProviderHost(process_id, provider_id)) {
+    // PlzNavigate: in some cancellation of navigation cases, it is possible
+    // for the pre-created host to have been destroyed before being claimed by
+    // the renderer. The provider is then destroyed in the renderer, and no
+    // matching host will be found.

[falken, 2017/05/22 08:28:12]

"pre-created host" means ServiceWorkerUtils::IsBrowserAssignedProviderId is
true? Maybe the comment should make that clear.

[shimazu, 2017/05/23 06:29:34]

Done.

+    CHECK(IsBrowserSideNavigationEnabled() &&
+          ServiceWorkerUtils::IsBrowserAssignedProviderId(provider_id));

[falken, 2017/05/22 08:28:12]

Why a CHECK here? From the style guide: "Use CHECK() if the consequence of a
failed assertion would be a security vulnerability, where crashing the browser
is preferable. "
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md

If you do CHECK, you don't need the return in line 93.

This doesn't look like a security vulnerability though, so I would probably opt
for a DCHECK.

[shimazu, 2017/05/23 06:29:34]

Thanks, it's just inherited from the previous implementation. Changed to DCHECK.

+    return;
+  }
+  context->RemoveProviderHost(process_id, provider_id);
+}
+
 }  // anonymous namespace
 
 ServiceWorkerProviderHost::OneShotGetReadyCallback::OneShotGetReadyCallback(
     const GetRegistrationForReadyCallback& callback)
     : callback(callback),
       called(false) {
 }
 
 ServiceWorkerProviderHost::OneShotGetReadyCallback::~OneShotGetReadyCallback() {
 }
@@ skipping 56 matching lines @@
     int render_process_id,
     ServiceWorkerProviderHostInfo info,
     base::WeakPtr<ServiceWorkerContextCore> context,
     ServiceWorkerDispatcherHost* dispatcher_host)
     : client_uuid_(base::GenerateGUID()),
       render_process_id_(render_process_id),
       render_thread_id_(kDocumentMainThreadId),
       info_(std::move(info)),
       context_(context),
       dispatcher_host_(dispatcher_host),
-      allow_association_(true) {
+      allow_association_(true),
+      binding_(this) {
   DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, info_.type);
 
   // PlzNavigate
   CHECK(render_process_id != ChildProcessHost::kInvalidUniqueID ||
         IsBrowserSideNavigationEnabled());
 
   if (info_.type == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
     // Actual thread id is set when the service worker context gets started.
     render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
   }
   context_->RegisterProviderHostByClientID(client_uuid_, this);
+
+  // PlzNavigate
+  // |provider_| and |binding_| will be bound on CompleteNavigationInitialized.
+  if (IsBrowserSideNavigationEnabled()) {
+    DCHECK(!info.client_ptr_info.is_valid() && !info.host_request.is_pending());
+    return;
+  }
+
+  provider_.Bind(std::move(info_.client_ptr_info));
+  binding_.Bind(std::move(info_.host_request));
+  binding_.set_connection_error_handler(base::Bind(
+      &RemoveProviderHost, context_, render_process_id, info_.provider_id));
 }
 
 ServiceWorkerProviderHost::~ServiceWorkerProviderHost() {
   if (context_)
     context_->UnregisterProviderHostByClientID(client_uuid_);
 
   // Clear docurl so the deferred activation of a waiting worker
   // won't associate the new version with a provider being destroyed.
   document_url_ = GURL();
   if (controlling_version_.get())
@@ skipping 26 matching lines @@
 
   std::set<std::string> schemes;
   GetContentClient()->browser()->GetSchemesBypassingSecureContextCheckWhitelist(
       &schemes);
   return schemes.find(document_url().scheme()) != schemes.end();
 }
 
 void ServiceWorkerProviderHost::OnVersionAttributesChanged(
     ServiceWorkerRegistration* registration,
     ChangedVersionAttributesMask changed_mask,
-    const ServiceWorkerRegistrationInfo& info) {
+    const ServiceWorkerRegistrationInfo& /* info */) {
   if (!get_ready_callback_ || get_ready_callback_->called)
     return;
   if (changed_mask.active_changed() && registration->active_version()) {
     // Wait until the state change so we don't send the get for ready
     // registration complete message before set version attributes message.
     registration->active_version()->RegisterStatusChangeCallback(base::Bind(
           &ServiceWorkerProviderHost::ReturnRegistrationForReadyIfNeeded,
           AsWeakPtr()));
   }
 }
@@ skipping 307 matching lines @@
 
 std::unique_ptr<ServiceWorkerProviderHost>
 ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
   DCHECK_NE(MSG_ROUTING_NONE, info_.route_id);
   DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
   DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, info_.type);
 
   std::unique_ptr<ServiceWorkerProviderHost> provisional_host =
       base::WrapUnique(new ServiceWorkerProviderHost(
-          process_id(), std::move(info_), context_, dispatcher_host()));
+          process_id(),
+          ServiceWorkerProviderHostInfo(std::move(info_), binding_.Unbind(),
+                                        provider_.PassInterface()),
+          context_, dispatcher_host()));
 
   for (const GURL& pattern : associated_patterns_)
     DecreaseProcessReference(pattern);
 
   for (auto& key_registration : matching_registrations_)
     DecreaseProcessReference(key_registration.second->pattern());
 
   if (associated_registration_.get()) {
     if (dispatcher_host_) {
       Send(new ServiceWorkerMsg_DisassociateRegistration(
@@ skipping 10 matching lines @@
 void ServiceWorkerProviderHost::CompleteCrossSiteTransfer(
     ServiceWorkerProviderHost* provisional_host) {
   DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_);
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, provisional_host->process_id());
   DCHECK_NE(MSG_ROUTING_NONE, provisional_host->frame_id());
 
   render_thread_id_ = kDocumentMainThreadId;
   info_.provider_id = provisional_host->provider_id();
   info_.type = provisional_host->provider_type();
 
+  // Take the connection over from the provisional host.
+  DCHECK(!provider_.is_bound());
+  DCHECK(!binding_.is_bound());
+  provider_.Bind(provisional_host->provider_.PassInterface());
+  binding_.Bind(provisional_host->binding_.Unbind());
+  binding_.set_connection_error_handler(
+      base::Bind(&RemoveProviderHost, context_, provisional_host->process_id(),
+                 provisional_host->provider_id()));
+
   FinalizeInitialization(provisional_host->process_id(),
                          provisional_host->frame_id(),
                          provisional_host->dispatcher_host());
 }
 
 // PlzNavigate
 void ServiceWorkerProviderHost::CompleteNavigationInitialized(
     int process_id,
-    int frame_routing_id,
+    ServiceWorkerProviderHostInfo info,
     ServiceWorkerDispatcherHost* dispatcher_host) {
   CHECK(IsBrowserSideNavigationEnabled());
   DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_);
   DCHECK_EQ(SERVICE_WORKER_PROVIDER_FOR_WINDOW, info_.type);
   DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
 
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, process_id);
-  DCHECK_NE(MSG_ROUTING_NONE, frame_routing_id);
+  DCHECK_EQ(info_.provider_id, info.provider_id);
+  DCHECK_NE(MSG_ROUTING_NONE, info.route_id);
 
-  FinalizeInitialization(process_id, frame_routing_id, dispatcher_host);
+  // Connect with the provider on the renderer.
+  DCHECK(!provider_.is_bound());
+  DCHECK(!binding_.is_bound());
+  provider_.Bind(std::move(info.client_ptr_info));
+  binding_.Bind(std::move(info.host_request));
+  binding_.set_connection_error_handler(
+      base::Bind(&RemoveProviderHost, context_, process_id, provider_id()));
+
+  FinalizeInitialization(process_id, info.route_id, dispatcher_host);
 }
 
 void ServiceWorkerProviderHost::SendUpdateFoundMessage(
     int registration_handle_id) {
   if (!dispatcher_host_)
     return;  // Could be nullptr in some tests.
 
   if (!IsReadyToSendMessages()) {
     queued_events_.push_back(
         base::Bind(&ServiceWorkerProviderHost::SendUpdateFoundMessage,
@@ skipping 174 matching lines @@
           render_thread_id_, provider_id(),
           GetOrCreateServiceWorkerHandle(
               associated_registration_->active_version()),
           false /* shouldNotifyControllerChange */,
           associated_registration_->active_version()->used_features()));
     }
   }
 }
 
 }  // namespace content