ServiceWorker: Stop exposing ServiceWorkerContextCore

content/browser/service_worker/service_worker_context_watcher.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/service_worker/service_worker_context_watcher.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "content/browser/service_worker/service_worker_context_observer.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ skipping 36 matching lines @@
 
 void ServiceWorkerContextWatcher::Stop() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ServiceWorkerContextWatcher::StopOnIOThread, this));
 }
 
 void ServiceWorkerContextWatcher::GetStoredRegistrationsOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  context_->context()->storage()->GetAllRegistrations(base::Bind(
+  context_->GetAllRegistrations(base::Bind(
       &ServiceWorkerContextWatcher::OnStoredRegistrationsOnIOThread, this));
 }
 
 void ServiceWorkerContextWatcher::OnStoredRegistrationsOnIOThread(
     const std::vector<ServiceWorkerRegistrationInfo>& stored_registrations) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   context_->AddObserver(this);
 
   base::ScopedPtrHashMap<int64, ServiceWorkerRegistrationInfo>
       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;
   registrations.reserve(registration_info_map.size());
   for (const auto& registration_id_info_pair : registration_info_map)
     registrations.push_back(*registration_id_info_pair.second);
 
   std::vector<ServiceWorkerVersionInfo> versions;
   versions.reserve(version_info_map_.size());
 
@@ skipping 160 matching lines @@
                        ServiceWorkerRegistrationInfo::IS_NOT_DELETED);
 }
 
 void ServiceWorkerContextWatcher::OnRegistrationDeleted(int64 registration_id,
                                                         const GURL& pattern) {
   SendRegistrationInfo(registration_id, pattern,
                        ServiceWorkerRegistrationInfo::IS_DELETED);
 }
 
 }  // namespace content