Convert //components/dom_distiller from scoped_ptr to std::unique_ptr

components/dom_distiller/core/distiller.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/distiller.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
 // Maximum number of distilled pages in an article.
 const size_t kMaxPagesInArticle = 32;
 }
 
 namespace dom_distiller {
 
 DistillerFactoryImpl::DistillerFactoryImpl(
-    scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
+    std::unique_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
     const dom_distiller::proto::DomDistillerOptions& dom_distiller_options)
     : distiller_url_fetcher_factory_(std::move(distiller_url_fetcher_factory)),
       dom_distiller_options_(dom_distiller_options) {}
 
 DistillerFactoryImpl::~DistillerFactoryImpl() {}
 
-scoped_ptr<Distiller> DistillerFactoryImpl::CreateDistillerForUrl(
+std::unique_ptr<Distiller> DistillerFactoryImpl::CreateDistillerForUrl(
     const GURL& unused) {
   // This default implementation has the same behavior for all URLs.
-  scoped_ptr<DistillerImpl> distiller(new DistillerImpl(
+  std::unique_ptr<DistillerImpl> distiller(new DistillerImpl(
       *distiller_url_fetcher_factory_, dom_distiller_options_));
   return std::move(distiller);
 }
 
 DistillerImpl::DistilledPageData::DistilledPageData() {}
 
 DistillerImpl::DistilledPageData::~DistilledPageData() {}
 
 DistillerImpl::DistillerImpl(
     const DistillerURLFetcherFactory& distiller_url_fetcher_factory,
@@ skipping 38 matching lines @@
 
 DistillerImpl::DistilledPageData* DistillerImpl::GetPageAtIndex(size_t index)
     const {
   DCHECK_LT(index, pages_.size());
   DistilledPageData* page_data = pages_[index];
   DCHECK(page_data);
   return page_data;
 }
 
 void DistillerImpl::DistillPage(const GURL& url,
-                                scoped_ptr<DistillerPage> distiller_page,
+                                std::unique_ptr<DistillerPage> distiller_page,
                                 const DistillationFinishedCallback& finished_cb,
                                 const DistillationUpdateCallback& update_cb) {
   DCHECK(AreAllPagesFinished());
   distiller_page_ = std::move(distiller_page);
   finished_cb_ = finished_cb;
   update_cb_ = update_cb;
 
   AddToDistillationQueue(0, url);
   DistillNextPage();
 }
@@ skipping 17 matching lines @@
         base::Bind(&DistillerImpl::OnPageDistillationFinished,
                    weak_factory_.GetWeakPtr(),
                    page_num,
                    url));
   }
 }
 
 void DistillerImpl::OnPageDistillationFinished(
     int page_num,
     const GURL& page_url,
-    scoped_ptr<proto::DomDistillerResult> distiller_result,
+    std::unique_ptr<proto::DomDistillerResult> distiller_result,
     bool distillation_successful) {
   DCHECK(started_pages_index_.find(page_num) != started_pages_index_.end());
   if (distillation_successful) {
 
     if (distiller_result->has_statistics_info() && page_num == 0) {
       if (distiller_result->statistics_info().has_word_count()) {
         UMA_HISTOGRAM_CUSTOM_COUNTS(
             "DomDistiller.Statistics.FirstPageWordCount",
             distiller_result->statistics_info().word_count(),
             1, 4000, 50);
@@ skipping 205 matching lines @@
        ++it) {
     update_pages.push_back(pages_[it->second]->distilled_page_proto);
   }
   return ArticleDistillationUpdate(update_pages, has_next_page, has_prev_page);
 }
 
 void DistillerImpl::RunDistillerCallbackIfDone() {
   DCHECK(!finished_cb_.is_null());
   if (AreAllPagesFinished()) {
     bool first_page = true;
-    scoped_ptr<DistilledArticleProto> article_proto(
+    std::unique_ptr<DistilledArticleProto> article_proto(
         new DistilledArticleProto());
     // Stitch the pages back into the article.
     for (std::map<int, size_t>::iterator it = finished_pages_index_.begin();
          it != finished_pages_index_.end();) {
       DistilledPageData* page_data = GetPageAtIndex(it->second);
       *(article_proto->add_pages()) = page_data->distilled_page_proto->data;
 
       if (first_page) {
         article_proto->set_title(page_data->distilled_page_proto->data.title());
         first_page = false;
@@ skipping 10 matching lines @@
     DCHECK(finished_pages_index_.empty());
 
     base::AutoReset<bool> dont_delete_this_in_callback(&destruction_allowed_,
                                                        false);
     finished_cb_.Run(std::move(article_proto));
     finished_cb_.Reset();
   }
 }
 
 }  // namespace dom_distiller