Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

components/drive/job_scheduler.cc

 // Copyright (c) 2012 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 "components/drive/job_scheduler.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 704 matching lines @@
                              base::Bind(&JobScheduler::OnEntryActionJobDone,
                                         weak_ptr_factory_.GetWeakPtr(),
                                         new_job->job_info.job_id,
                                         callback));
   new_job->abort_callback = callback;
   StartJob(new_job);
 }
 
 JobScheduler::JobEntry* JobScheduler::CreateNewJob(JobType type) {
   JobEntry* job = new JobEntry(type);
-  job->job_info.job_id = job_map_.Add(job);  // Takes the ownership of |job|.
+  job->job_info.job_id = job_map_.Add(
+      std::unique_ptr<JobEntry>(job));  // Takes the ownership of |job|.

[aelias_OOO_until_Jul13, 2016/11/10 06:04:48]

Please replace this with base::MakeUnique<JobEntry>(type) and remove the
comment.

[rlanday, 2016/11/10 18:20:01]

So this one's a little weird, job is actually used on both the lhs and rhs of
this expression, and then returned from the function. I might be able to do
something like adding the pointer and immediately retrieving it from the IDMap
again, is that preferable?

[aelias_OOO_until_Jul13, 2016/11/10 19:36:19]

Yes, that's preferable in both cases, thanks.

   return job;
 }
 
 void JobScheduler::StartJob(JobEntry* job) {
   DCHECK(!job->task.is_null());
 
   QueueJob(job->job_info.job_id);
   NotifyJobAdded(job->job_info);
   DoJobLoop(GetJobQueueType(job->job_info.job_type));
 }
@@ skipping 453 matching lines @@
     case FILE_QUEUE:
       return "FILE_QUEUE";
     case NUM_QUEUES:
       break;  // This value is just a sentinel. Should never be used.
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive