Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/service_worker/embedded_worker_dispatcher.cc

 // Copyright 2013 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/renderer/service_worker/embedded_worker_dispatcher.h"
 
 #include <memory>
+#include <utility>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/public/common/content_client.h"
@@ skipping 132 matching lines @@
           ? blink::WebEmbeddedWorkerStartData::PauseAfterDownload
           : blink::WebEmbeddedWorkerStartData::DontPauseAfterDownload;
 
   wrapper->worker()->startWorkerContext(start_data);
   return wrapper;
 }
 
 void EmbeddedWorkerDispatcher::RegisterWorker(
     int embedded_worker_id,
     std::unique_ptr<WorkerWrapper> wrapper) {
-  workers_.AddWithID(wrapper.release(), embedded_worker_id);
+  workers_.AddWithID(std::move(wrapper), embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::UnregisterWorker(int embedded_worker_id) {
   if (ContainsKey(stop_worker_times_, embedded_worker_id)) {
     base::TimeTicks stop_time = stop_worker_times_[embedded_worker_id];
     UMA_HISTOGRAM_MEDIUM_TIMES("ServiceWorker.TerminateThread.Time",
                                base::TimeTicks::Now() - stop_time);
     stop_worker_times_.erase(embedded_worker_id);
   }
   workers_.Remove(embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::RecordStopWorkerTimer(int embedded_worker_id) {
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   DCHECK(wrapper);
   // This should eventually call WorkerContextDestroyed. (We may need to post
   // a delayed task to forcibly abort the worker context if we find it
   // necessary)
   stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now();
 }
 
 }  // namespace content