ServiceWorker: Stop exposing ServiceWorkerContextCore

content/browser/service_worker/service_worker_context_watcher.cc

Index: content/browser/service_worker/service_worker_context_watcher.cc
diff --git a/content/browser/service_worker/service_worker_context_watcher.cc b/content/browser/service_worker/service_worker_context_watcher.cc
index 5d1a1a8ff813dcd845e9299ebe358a64a79a2b90..1cf5c08efdf52e8691563ca470702d0867b1f1a5 100644
--- a/content/browser/service_worker/service_worker_context_watcher.cc
+++ b/content/browser/service_worker/service_worker_context_watcher.cc
@@ -54,7 +54,7 @@ void ServiceWorkerContextWatcher::Stop() {
 
 void ServiceWorkerContextWatcher::GetStoredRegistrationsOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  context_->context()->storage()->GetAllRegistrations(base::Bind(
+  context_->GetAllRegistrations(base::Bind(
       &ServiceWorkerContextWatcher::OnStoredRegistrationsOnIOThread, this));
 }
 
@@ -67,11 +67,10 @@ void ServiceWorkerContextWatcher::OnStoredRegistrationsOnIOThread(
       registration_info_map;
   for (const auto& registration : stored_registrations)
     StoreRegistrationInfo(registration, &registration_info_map);
-  for (const auto& registration :
-       context_->context()->GetAllLiveRegistrationInfo()) {
+  for (const auto& registration : context_->GetAllLiveRegistrationInfo()) {
     StoreRegistrationInfo(registration, &registration_info_map);
   }

[falken, 2015/04/15 08:03:20]

nit: braces not needed

[nhiroki, 2015/04/15 23:38:16]

Done.

-  for (const auto& version : context_->context()->GetAllLiveVersionInfo())
+  for (const auto& version : context_->GetAllLiveVersionInfo())
     StoreVersionInfo(version);
 
   std::vector<ServiceWorkerRegistrationInfo> registrations;