Remove stl_util's deletion functions from remaining quic code.

net/quic/chromium/crypto/channel_id_chromium.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 "net/quic/chromium/crypto/channel_id_chromium.h"
 
 #include <utility>
 #include <vector>
 
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "net/base/net_errors.h"
 #include "net/cert/asn1_util.h"
 #include "net/ssl/channel_id_service.h"
 
 namespace net {
 
 ChannelIDKeyChromium::ChannelIDKeyChromium(
@@ skipping 172 matching lines @@
   channel_id_key_.reset(
       new ChannelIDKeyChromium(std::move(channel_id_crypto_key_)));
   return result;
 }
 
 ChannelIDSourceChromium::ChannelIDSourceChromium(
     ChannelIDService* channel_id_service)
     : channel_id_service_(channel_id_service) {}
 
 ChannelIDSourceChromium::~ChannelIDSourceChromium() {
-  base::STLDeleteElements(&active_jobs_);
 }
 
 QuicAsyncStatus ChannelIDSourceChromium::GetChannelIDKey(
     const std::string& hostname,
     std::unique_ptr<ChannelIDKey>* channel_id_key,
     ChannelIDSourceCallback* callback) {
-  std::unique_ptr<Job> job(new Job(this, channel_id_service_));
+  std::unique_ptr<Job> job = base::MakeUnique<Job>(this, channel_id_service_);
   QuicAsyncStatus status =
       job->GetChannelIDKey(hostname, channel_id_key, callback);
   if (status == QUIC_PENDING) {
-    active_jobs_.insert(job.release());
+    Job* job_ptr = job.get();
+    active_jobs_[job_ptr] = std::move(job);
   }
   return status;
 }
 
 void ChannelIDSourceChromium::OnJobComplete(Job* job) {
   active_jobs_.erase(job);
-  delete job;
 }
 
 }  // namespace net