Change ScopedPtrHashMap's 2nd template parameter

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 45 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   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>
+  base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerRegistrationInfo>>
       registration_info_map;
   for (const auto& registration : stored_registrations)
     StoreRegistrationInfo(registration, &registration_info_map);
   for (const auto& registration : context_->GetAllLiveRegistrationInfo())
     StoreRegistrationInfo(registration, &registration_info_map);
   for (const auto& version : context_->GetAllLiveVersionInfo())
     StoreVersionInfo(version);
 
   std::vector<ServiceWorkerRegistrationInfo> registrations;
   registrations.reserve(registration_info_map.size());
@@ skipping 21 matching lines @@
 void ServiceWorkerContextWatcher::StopOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   context_->RemoveObserver(this);
 }
 
 ServiceWorkerContextWatcher::~ServiceWorkerContextWatcher() {
 }
 
 void ServiceWorkerContextWatcher::StoreRegistrationInfo(
     const ServiceWorkerRegistrationInfo& registration_info,
-    base::ScopedPtrHashMap<int64, ServiceWorkerRegistrationInfo>* info_map) {
+    base::ScopedPtrHashMap<int64, scoped_ptr<ServiceWorkerRegistrationInfo>>*
+        info_map) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (registration_info.registration_id == kInvalidServiceWorkerRegistrationId)
     return;
   info_map->set(registration_info.registration_id,
                 scoped_ptr<ServiceWorkerRegistrationInfo>(
                     new ServiceWorkerRegistrationInfo(registration_info)));
   StoreVersionInfo(registration_info.active_version);
   StoreVersionInfo(registration_info.waiting_version);
   StoreVersionInfo(registration_info.installing_version);
 }
@@ skipping 124 matching lines @@
                        ServiceWorkerRegistrationInfo::IS_NOT_DELETED);
 }
 
 void ServiceWorkerContextWatcher::OnRegistrationDeleted(int64 registration_id,
                                                         const GURL& pattern) {
   SendRegistrationInfo(registration_id, pattern,
                        ServiceWorkerRegistrationInfo::IS_DELETED);
 }
 
 }  // namespace content