SharedWorker: Clean up SharedWorkerHost

content/browser/shared_worker/shared_worker_host.cc

 // Copyright 2014 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/shared_worker/shared_worker_host.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "content/browser/devtools/shared_worker_devtools_manager.h"
 #include "content/browser/message_port_message_filter.h"
 #include "content/browser/message_port_service.h"
@@ skipping 57 matching lines @@
 SharedWorkerHost::~SharedWorkerHost() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   UMA_HISTOGRAM_LONG_TIMES("SharedWorker.TimeToDeleted",
                            base::TimeTicks::Now() - creation_time_);
   if (!closed_ && !termination_message_sent_)
     NotifyWorkerDestroyed(worker_process_id_, worker_route_id_);
   SharedWorkerServiceImpl::GetInstance()->NotifyWorkerDestroyed(
       worker_process_id_, worker_route_id_);
 }
 
-bool SharedWorkerHost::Send(IPC::Message* message) {
-  if (!container_render_filter_) {
-    delete message;
+bool SharedWorkerHost::Send(std::unique_ptr<IPC::Message> message) {
+  if (!container_render_filter_)
     return false;
-  }
-  return container_render_filter_->Send(message);
+  return container_render_filter_->Send(message.release());
 }
 
 void SharedWorkerHost::Start(bool pause_on_start) {
   WorkerProcessMsg_CreateWorker_Params params;
   params.url = instance_->url();
   params.name = instance_->name();
   params.content_security_policy = instance_->content_security_policy();
   params.security_policy_type = instance_->security_policy_type();
   params.creation_address_space = instance_->creation_address_space();
   params.pause_on_start = pause_on_start;
   params.route_id = worker_route_id_;
-  Send(new WorkerProcessMsg_CreateWorker(params));
+  Send(base::MakeUnique<WorkerProcessMsg_CreateWorker>(params));
 
-  for (FilterList::const_iterator i = filters_.begin(); i != filters_.end();
-       ++i) {
-    i->filter()->Send(new ViewMsg_WorkerCreated(i->route_id()));
-  }
+  for (const FilterInfo& info : filters_)
+    info.filter()->Send(new ViewMsg_WorkerCreated(info.route_id()));
 }
 
 bool SharedWorkerHost::FilterMessage(const IPC::Message& message,
                                      SharedWorkerMessageFilter* filter) {
   if (!IsAvailable() || !HasFilter(filter, message.routing_id()))
     return false;
 
   RelayMessage(message, filter);
   return true;
 }
@@ skipping 59 matching lines @@
 void SharedWorkerHost::WorkerScriptLoaded() {
   UMA_HISTOGRAM_TIMES("SharedWorker.TimeToScriptLoaded",
                       base::TimeTicks::Now() - creation_time_);
 }
 
 void SharedWorkerHost::WorkerScriptLoadFailed() {
   UMA_HISTOGRAM_TIMES("SharedWorker.TimeToScriptLoadFailed",
                       base::TimeTicks::Now() - creation_time_);
   if (!instance_)
     return;
-  for (FilterList::const_iterator i = filters_.begin(); i != filters_.end();
-       ++i) {
-    i->filter()->Send(new ViewMsg_WorkerScriptLoadFailed(i->route_id()));
-  }
+  for (const FilterInfo& info : filters_)
+    info.filter()->Send(new ViewMsg_WorkerScriptLoadFailed(info.route_id()));
 }
 
 void SharedWorkerHost::WorkerConnected(int message_port_id) {
   if (!instance_)
     return;
-  for (FilterList::const_iterator i = filters_.begin(); i != filters_.end();
-       ++i) {
-    if (i->message_port_id() != message_port_id)
+  for (const FilterInfo& info : filters_) {
+    if (info.message_port_id() != message_port_id)
       continue;
-    i->filter()->Send(new ViewMsg_WorkerConnected(i->route_id()));
+    info.filter()->Send(new ViewMsg_WorkerConnected(info.route_id()));
     return;
   }
 }
 
 void SharedWorkerHost::AllowFileSystem(
     const GURL& url,
     std::unique_ptr<IPC::Message> reply_msg) {
   if (!instance_)
     return;
   GetContentClient()->browser()->AllowWorkerFileSystem(
       url,
       instance_->resource_context(),
       GetRenderFrameIDsForWorker(),
       base::Bind(&SharedWorkerHost::AllowFileSystemResponse,
                  weak_factory_.GetWeakPtr(),
                  base::Passed(&reply_msg)));
 }
 
 void SharedWorkerHost::AllowFileSystemResponse(
     std::unique_ptr<IPC::Message> reply_msg,
     bool allowed) {
   WorkerProcessHostMsg_RequestFileSystemAccessSync::WriteReplyParams(
       reply_msg.get(),
       allowed);
-  Send(reply_msg.release());
+  Send(std::move(reply_msg));
 }
 
 void SharedWorkerHost::AllowIndexedDB(const GURL& url,
                                       const base::string16& name,
                                       bool* result) {
   if (!instance_)
     return;
   *result = GetContentClient()->browser()->AllowWorkerIndexedDB(
       url, name, instance_->resource_context(), GetRenderFrameIDsForWorker());
 }
@@ skipping 13 matching lines @@
 
     DCHECK(container_render_filter_);
     new_routing_id = container_render_filter_->GetNextRoutingID();
     MessagePortService::GetInstance()->UpdateMessagePort(
         sent_message_port_id,
         container_render_filter_->message_port_message_filter(),
         new_routing_id);
     SetMessagePortID(
         incoming_filter, message.routing_id(), sent_message_port_id);
     // Resend the message with the new routing id.
-    Send(new WorkerMsg_Connect(
+    Send(base::MakeUnique<WorkerMsg_Connect>(
         worker_route_id_, sent_message_port_id, new_routing_id));
 
     // Send any queued messages for the sent port.
     MessagePortService::GetInstance()->SendQueuedMessagesIfPossible(
         sent_message_port_id);
   } else {
-    IPC::Message* new_message = new IPC::Message(message);
+    std::unique_ptr<IPC::Message> new_message =
+        base::MakeUnique<IPC::Message>(message);
     new_message->set_routing_id(worker_route_id_);
-    Send(new_message);
+    Send(std::move(new_message));
     return;
   }
 }
 
 void SharedWorkerHost::TerminateWorker() {
   termination_message_sent_ = true;
   if (!closed_)
     NotifyWorkerDestroyed(worker_process_id_, worker_route_id_);
-  Send(new WorkerMsg_TerminateWorkerContext(worker_route_id_));
+  Send(base::MakeUnique<WorkerMsg_TerminateWorkerContext>(worker_route_id_));
 }
 
 std::vector<std::pair<int, int> >
 SharedWorkerHost::GetRenderFrameIDsForWorker() {
   std::vector<std::pair<int, int> > result;
   if (!instance_)
     return result;
   const WorkerDocumentSet::DocumentInfoSet& documents =
       worker_document_set_->documents();
-  for (WorkerDocumentSet::DocumentInfoSet::const_iterator doc =
-           documents.begin();
-       doc != documents.end();
-       ++doc) {
+  for (const WorkerDocumentSet::DocumentInfo& doc : documents) {
     result.push_back(
-        std::make_pair(doc->render_process_id(), doc->render_frame_id()));
+        std::make_pair(doc.render_process_id(), doc.render_frame_id()));
   }
   return result;
 }
 
 bool SharedWorkerHost::IsAvailable() const {
   return instance_ && !termination_message_sent_ && !closed_;
 }
 
 void SharedWorkerHost::AddFilter(SharedWorkerMessageFilter* filter,
                                  int route_id) {
@@ skipping 28 matching lines @@
                                         int message_port_id) {
   for (FilterList::iterator i = filters_.begin(); i != filters_.end(); ++i) {
     if (i->filter() == filter && i->route_id() == route_id) {
       i->set_message_port_id(message_port_id);
       return;
     }
   }
 }
 
 }  // namespace content