Revert of ServiceWorker: Keep info as a member of ServiceWorkerProviderHost

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 79 matching lines @@
 // static
 std::unique_ptr<ServiceWorkerProviderHost>
 ServiceWorkerProviderHost::PreCreateNavigationHost(
     base::WeakPtr<ServiceWorkerContextCore> context,
     bool are_ancestors_secure,
     const WebContentsGetter& web_contents_getter) {
   CHECK(IsBrowserSideNavigationEnabled());
   // Generate a new browser-assigned id for the host.
   int provider_id = g_next_navigation_provider_id--;
   auto host = base::WrapUnique(new ServiceWorkerProviderHost(
-      ChildProcessHost::kInvalidUniqueID,
-      ServiceWorkerProviderHostInfo(provider_id, MSG_ROUTING_NONE,
-                                    SERVICE_WORKER_PROVIDER_FOR_WINDOW,
-                                    are_ancestors_secure),
-      context, nullptr));
+      ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE, provider_id,
+      SERVICE_WORKER_PROVIDER_FOR_WINDOW, are_ancestors_secure, context,
+      nullptr));
   host->web_contents_getter_ = web_contents_getter;
   return host;
 }
 
 // static
 std::unique_ptr<ServiceWorkerProviderHost> ServiceWorkerProviderHost::Create(
     int process_id,
     ServiceWorkerProviderHostInfo info,
     base::WeakPtr<ServiceWorkerContextCore> context,
     ServiceWorkerDispatcherHost* dispatcher_host) {
   return base::WrapUnique(new ServiceWorkerProviderHost(
-      process_id, std::move(info), context, dispatcher_host));
+      process_id, info.route_id, info.provider_id, info.type,
+      info.is_parent_frame_secure, context, dispatcher_host));
 }
 
 void ServiceWorkerProviderHost::BindWorkerFetchContext(
     mojom::ServiceWorkerWorkerClientAssociatedPtrInfo client_ptr_info) {
   DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch));
   mojom::ServiceWorkerWorkerClientAssociatedPtr client;
   client.Bind(std::move(client_ptr_info));
   client.set_connection_error_handler(
       base::Bind(&ServiceWorkerProviderHost::UnregisterWorkerFetchContext,
                  base::Unretained(this), client.get()));
 
   if (controlling_version_)
     client->SetControllerServiceWorker(controlling_version_->version_id());
 
   auto result = worker_clients_.insert(
       std::make_pair<mojom::ServiceWorkerWorkerClient*,
                      mojom::ServiceWorkerWorkerClientAssociatedPtr>(
           client.get(), std::move(client)));
   DCHECK(result.second);
 }
 
 void ServiceWorkerProviderHost::UnregisterWorkerFetchContext(
     mojom::ServiceWorkerWorkerClient* client) {
   DCHECK(worker_clients_.count(client));
   worker_clients_.erase(client);
 }
 
 ServiceWorkerProviderHost::ServiceWorkerProviderHost(
     int render_process_id,
-    ServiceWorkerProviderHostInfo info,
+    int route_id,
+    int provider_id,
+    ServiceWorkerProviderType provider_type,
+    bool is_parent_frame_secure,
     base::WeakPtr<ServiceWorkerContextCore> context,
     ServiceWorkerDispatcherHost* dispatcher_host)
     : client_uuid_(base::GenerateGUID()),
       render_process_id_(render_process_id),
+      route_id_(route_id),
       render_thread_id_(kDocumentMainThreadId),
-      info_(std::move(info)),
+      provider_id_(provider_id),
+      provider_type_(provider_type),
+      is_parent_frame_secure_(is_parent_frame_secure),
       context_(context),
       dispatcher_host_(dispatcher_host),
       allow_association_(true) {
-  DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, info_.type);
+  DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
 
   // PlzNavigate
   CHECK(render_process_id != ChildProcessHost::kInvalidUniqueID ||
         IsBrowserSideNavigationEnabled());
 
-  if (info_.type == SERVICE_WORKER_PROVIDER_FOR_CONTROLLER) {
+  if (provider_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);
 }
 
 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())
     controlling_version_->RemoveControllee(this);
 
   RemoveAllMatchingRegistrations();
 
   for (const GURL& pattern : associated_patterns_)
     DecreaseProcessReference(pattern);
 }
 
 int ServiceWorkerProviderHost::frame_id() const {
-  if (info_.type == SERVICE_WORKER_PROVIDER_FOR_WINDOW)
-    return info_.route_id;
+  if (provider_type_ == SERVICE_WORKER_PROVIDER_FOR_WINDOW)
+    return route_id_;
   return MSG_ROUTING_NONE;
 }
 
 bool ServiceWorkerProviderHost::IsContextSecureForServiceWorker() const {
   // |document_url_| may be empty if loading has not begun, or
   // ServiceWorkerRequestHandler didn't handle the load (because e.g. another
   // handler did first, or the initial request URL was such that
   // OriginCanAccessServiceWorkers returned false).
   if (!document_url_.is_valid())
     return false;
@@ skipping 94 matching lines @@
 
 void ServiceWorkerProviderHost::SetHostedVersion(
     ServiceWorkerVersion* version) {
   DCHECK(!IsProviderForClient());
   DCHECK_EQ(EmbeddedWorkerStatus::STARTING, version->running_status());
   DCHECK_EQ(render_process_id_, version->embedded_worker()->process_id());
   running_hosted_version_ = version;
 }
 
 bool ServiceWorkerProviderHost::IsProviderForClient() const {
-  switch (info_.type) {
+  switch (provider_type_) {
     case SERVICE_WORKER_PROVIDER_FOR_WINDOW:
     case SERVICE_WORKER_PROVIDER_FOR_WORKER:
     case SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER:
       return true;
     case SERVICE_WORKER_PROVIDER_FOR_CONTROLLER:
       return false;
     case SERVICE_WORKER_PROVIDER_UNKNOWN:
-      NOTREACHED() << info_.type;
+      NOTREACHED() << provider_type_;
   }
-  NOTREACHED() << info_.type;
+  NOTREACHED() << provider_type_;
   return false;
 }
 
 blink::WebServiceWorkerClientType ServiceWorkerProviderHost::client_type()
     const {
-  switch (info_.type) {
+  switch (provider_type_) {
     case SERVICE_WORKER_PROVIDER_FOR_WINDOW:
       return blink::kWebServiceWorkerClientTypeWindow;
     case SERVICE_WORKER_PROVIDER_FOR_WORKER:
       return blink::kWebServiceWorkerClientTypeWorker;
     case SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER:
       return blink::kWebServiceWorkerClientTypeSharedWorker;
     case SERVICE_WORKER_PROVIDER_FOR_CONTROLLER:
     case SERVICE_WORKER_PROVIDER_UNKNOWN:
-      NOTREACHED() << info_.type;
+      NOTREACHED() << provider_type_;
   }
-  NOTREACHED() << info_.type;
+  NOTREACHED() << provider_type_;
   return blink::kWebServiceWorkerClientTypeWindow;
 }
 
 void ServiceWorkerProviderHost::AssociateRegistration(
     ServiceWorkerRegistration* registration,
     bool notify_controllerchange) {
   CHECK(IsContextSecureForServiceWorker());
   DCHECK(CanAssociateRegistration(registration));
   associated_registration_ = registration;
   AddMatchingRegistration(registration);
@@ skipping 185 matching lines @@
   if (get_ready_callback_)
     return false;
   get_ready_callback_.reset(new OneShotGetReadyCallback(callback));
   ReturnRegistrationForReadyIfNeeded();
   return true;
 }
 
 std::unique_ptr<ServiceWorkerProviderHost>
 ServiceWorkerProviderHost::PrepareForCrossSiteTransfer() {
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, render_process_id_);
-  DCHECK_NE(MSG_ROUTING_NONE, info_.route_id);
+  DCHECK_NE(MSG_ROUTING_NONE, route_id_);
   DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
-  DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, info_.type);
+  DCHECK_NE(SERVICE_WORKER_PROVIDER_UNKNOWN, provider_type_);
 
   std::unique_ptr<ServiceWorkerProviderHost> provisional_host =
       base::WrapUnique(new ServiceWorkerProviderHost(
-          process_id(), std::move(info_), context_, dispatcher_host()));
+          process_id(), frame_id(), provider_id(), provider_type(),
+          is_parent_frame_secure(), 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(
           render_thread_id_, provider_id()));
     }
   }
 
   render_process_id_ = ChildProcessHost::kInvalidUniqueID;
+  route_id_ = MSG_ROUTING_NONE;
   render_thread_id_ = kInvalidEmbeddedWorkerThreadId;
+  provider_id_ = kInvalidServiceWorkerProviderId;
+  provider_type_ = SERVICE_WORKER_PROVIDER_UNKNOWN;
   dispatcher_host_ = nullptr;
   return provisional_host;
 }
 
 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();
+  provider_id_ = provisional_host->provider_id();
+  provider_type_ = provisional_host->provider_type();
 
   FinalizeInitialization(provisional_host->process_id(),
                          provisional_host->frame_id(),
                          provisional_host->dispatcher_host());
 }
 
 // PlzNavigate
 void ServiceWorkerProviderHost::CompleteNavigationInitialized(
     int process_id,
     int frame_routing_id,
     ServiceWorkerDispatcherHost* dispatcher_host) {
   CHECK(IsBrowserSideNavigationEnabled());
   DCHECK_EQ(ChildProcessHost::kInvalidUniqueID, render_process_id_);
-  DCHECK_EQ(SERVICE_WORKER_PROVIDER_FOR_WINDOW, info_.type);
+  DCHECK_EQ(SERVICE_WORKER_PROVIDER_FOR_WINDOW, provider_type_);
   DCHECK_EQ(kDocumentMainThreadId, render_thread_id_);
 
   DCHECK_NE(ChildProcessHost::kInvalidUniqueID, process_id);
   DCHECK_NE(MSG_ROUTING_NONE, frame_routing_id);
 
   FinalizeInitialization(process_id, frame_routing_id, dispatcher_host);
 }
 
 void ServiceWorkerProviderHost::SendUpdateFoundMessage(
     int registration_handle_id) {
@@ skipping 157 matching lines @@
   DCHECK(dispatcher_host_);
   DCHECK(IsReadyToSendMessages());
   dispatcher_host_->Send(message);
 }
 
 void ServiceWorkerProviderHost::FinalizeInitialization(
     int process_id,
     int frame_routing_id,
     ServiceWorkerDispatcherHost* dispatcher_host) {
   render_process_id_ = process_id;
-  info_.route_id = frame_routing_id;
+  route_id_ = frame_routing_id;
   dispatcher_host_ = dispatcher_host;
 
   for (const GURL& pattern : associated_patterns_)
     IncreaseProcessReference(pattern);
 
   for (auto& key_registration : matching_registrations_)
     IncreaseProcessReference(key_registration.second->pattern());
 
   if (associated_registration_.get()) {
     SendAssociateRegistrationMessage();
     if (dispatcher_host_ && associated_registration_->active_version()) {
       Send(new ServiceWorkerMsg_SetControllerServiceWorker(
           render_thread_id_, provider_id(),
           GetOrCreateServiceWorkerHandle(
               associated_registration_->active_version()),
           false /* shouldNotifyControllerChange */,
           associated_registration_->active_version()->used_features()));
     }
   }
 }
 
 }  // namespace content