ServiceWorker: Stop exposing ServiceWorkerContextCore

content/browser/navigator_connect/navigator_connect_service_worker_service_factory.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/navigator_connect/navigator_connect_service_worker_service_factory.h"
 
 #include "base/bind.h"
 #include "content/browser/message_port_service.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_utils.h"
@@ skipping 65 matching lines @@
   DCHECK(route_id == client_.message_port_id);
   DCHECK(message.message_as_value.empty());
 
   // Hold messages on transferred message ports. Actual delivery of the message
   // by the service can be asynchronous. When a message is delivered,
   // WebMessagePortChannelImpl instances will be constructed which send
   // MessagePortHostMsg_ReleaseMessages to release messages.
   for (const auto& port : sent_message_ports)
     MessagePortService::GetInstance()->HoldMessages(port.id);
 
-  service_worker_context_->context()->storage()->FindRegistrationForId(
+  service_worker_context_->FindRegistrationForId(
       service_worker_registration_id_, service_worker_registration_origin_,
       base::Bind(&NavigatorConnectServiceWorkerService::DeliverMessage,
                  weak_factory_.GetWeakPtr(), message.message_as_string,
                  sent_message_ports));
 }
 
 void NavigatorConnectServiceWorkerService::SendMessagesAreQueued(int route_id) {
   NOTREACHED() << "navigator.connect endpoints should never queue messages.";
 }
 
@@ skipping 39 matching lines @@
   // if no other factory claims to handle the url.
   return true;
 }
 
 void NavigatorConnectServiceWorkerServiceFactory::Connect(
     const NavigatorConnectClient& client,
     const ConnectCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Find the right service worker to service this connection.
-  service_worker_context_->context()->storage()->FindRegistrationForDocument(
+  service_worker_context_->FindRegistrationForDocument(
       client.target_url,
       base::Bind(&NavigatorConnectServiceWorkerServiceFactory::
                      GotServiceWorkerRegistration,
                  weak_factory_.GetWeakPtr(), callback, client));
 }
 
 void NavigatorConnectServiceWorkerServiceFactory::GotServiceWorkerRegistration(
     const ConnectCallback& callback,
     const NavigatorConnectClient& client,
     ServiceWorkerStatusCode status,
@@ skipping 35 matching lines @@
   // TODO(mek): http://crbug.com/462744 Keep track of these
   // NavigatorConnectServiceWorkerService instances and clean them up when a
   // service worker registration is deleted.
   callback.Run(
       new NavigatorConnectServiceWorkerService(service_worker_context_, client,
                                                service_worker_registration),
       false);
 }
 
 }  // namespace content