ServiceWorker: Stop exposing ServiceWorkerContextCore

content/public/browser/push_messaging_service.cc

Index: content/public/browser/push_messaging_service.cc
diff --git a/content/public/browser/push_messaging_service.cc b/content/public/browser/push_messaging_service.cc
index 061af7ad6a4f6846cd10a42f1021e602e9438401..27335eb9adfbab9ca60bce7e78f50ae897fd6bb2 100644
--- a/content/public/browser/push_messaging_service.cc
+++ b/content/public/browser/push_messaging_service.cc
@@ -50,7 +50,7 @@ void GetUserDataOnIO(
     const std::string& key,
     const PushMessagingService::StringCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  service_worker_context_wrapper->context()->storage()->GetUserData(
+  service_worker_context_wrapper->GetRegistrationUserData(
       service_worker_registration_id, key,
       base::Bind(&CallStringCallbackFromIO, callback));
 }
@@ -61,7 +61,7 @@ void SetNotificationsShownOnIO(
     const std::string& data,
     const PushMessagingService::ResultCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  service_worker_context_wrapper->context()->storage()->StoreUserData(
+  service_worker_context_wrapper->StoreRegistrationUserData(
       service_worker_registration_id, origin,
       kNotificationsShownServiceWorkerKey, data,
       base::Bind(&CallResultCallbackFromIO, callback));
@@ -73,7 +73,7 @@ void ClearPushRegistrationIDOnIO(
     const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  service_worker_context->context()->storage()->ClearUserData(
+  service_worker_context->ClearRegistrationUserData(
       service_worker_registration_id,
       kPushRegistrationIdServiceWorkerKey,
       base::Bind(&CallClosureFromIO, callback));