Remove ScopedVector in //components/dom_distiller/

components/dom_distiller/core/dom_distiller_service.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 "components/dom_distiller/core/dom_distiller_service.h"
 
 #include <utility>
 
 #include "base/guid.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/dom_distiller/core/distilled_content_store.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
@@ skipping 187 matching lines @@
   if (*task_tracker) {
     return false;
   }
 
   ArticleEntry skeleton_entry = CreateSkeletonEntryForUrl(url);
   *task_tracker = CreateTaskTracker(skeleton_entry);
   return true;
 }
 
 TaskTracker* DomDistillerService::GetTaskTrackerForUrl(const GURL& url) const {
-  for (TaskList::const_iterator it = tasks_.begin(); it != tasks_.end(); ++it) {
+  for (auto it = tasks_.begin(); it != tasks_.end(); ++it) {
     if ((*it)->HasUrl(url)) {
-      return *it;
+      return (*it).get();
     }
   }
   return nullptr;
 }
 
 TaskTracker* DomDistillerService::GetTaskTrackerForEntry(
     const ArticleEntry& entry) const {
   const std::string& entry_id = entry.entry_id();
-  for (TaskList::const_iterator it = tasks_.begin(); it != tasks_.end(); ++it) {
+  for (auto it = tasks_.begin(); it != tasks_.end(); ++it) {
     if ((*it)->HasEntryId(entry_id)) {
-      return *it;
+      return (*it).get();
     }
   }
   return nullptr;
 }
 
 bool DomDistillerService::GetOrCreateTaskTrackerForEntry(
     const ArticleEntry& entry,
     TaskTracker** task_tracker) {
   *task_tracker = GetTaskTrackerForEntry(entry);
   if (!*task_tracker) {
     *task_tracker = CreateTaskTracker(entry);
     return true;
   }
   return false;
 }
 
 TaskTracker* DomDistillerService::CreateTaskTracker(const ArticleEntry& entry) {
   TaskTracker::CancelCallback cancel_callback =
       base::Bind(&DomDistillerService::CancelTask, base::Unretained(this));
-  TaskTracker* tracker =
-      new TaskTracker(entry, cancel_callback, content_store_.get());
-  tasks_.push_back(tracker);
-  return tracker;
+  tasks_.push_back(base::MakeUnique<TaskTracker>(entry, cancel_callback,
+                                                 content_store_.get()));
+  return tasks_.back().get();
 }
 
 void DomDistillerService::CancelTask(TaskTracker* task) {
-  TaskList::iterator it = std::find(tasks_.begin(), tasks_.end(), task);
+  auto it = std::find_if(tasks_.begin(), tasks_.end(),
+                         [task](const std::unique_ptr<TaskTracker>& t) {
+                           return task == t.get();
+                         });
   if (it != tasks_.end()) {
-    tasks_.weak_erase(it);
+    it->release();
+    tasks_.erase(it);
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, task);
   }
 }
 
 void DomDistillerService::AddDistilledPageToList(
     const ArticleEntry& entry,
     const DistilledArticleProto* article_proto,
     bool distillation_succeeded) {
   DCHECK(IsEntryValid(entry));
   if (store_ && distillation_succeeded) {
@@ skipping 16 matching lines @@
   if (store_) {
     store_->RemoveObserver(observer);
   }
 }
 
 DistilledPagePrefs* DomDistillerService::GetDistilledPagePrefs() {
   return distilled_page_prefs_.get();
 }
 
 }  // namespace dom_distiller