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

components/dom_distiller/core/distiller.h

 // 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.
 
 #ifndef COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 
 #include <stddef.h>
 
 #include <map>
+#include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/distiller_url_fetcher.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 class DistillerImpl;
 
 class Distiller {
  public:
-  typedef base::Callback<void(scoped_ptr<DistilledArticleProto>)>
+  typedef base::Callback<void(std::unique_ptr<DistilledArticleProto>)>
       DistillationFinishedCallback;
   typedef base::Callback<void(const ArticleDistillationUpdate&)>
       DistillationUpdateCallback;
 
   virtual ~Distiller() {}
 
   // Distills a page, and asynchronously returns the article HTML to the
   // supplied |finished_cb| callback. |update_cb| is invoked whenever article
   // under distillation is updated with more data.
   // E.g. when distilling a 2 page article, |update_cb| may be invoked each time
   // a distilled page is added and |finished_cb| will be invoked once
   // distillation is completed.
   virtual void DistillPage(const GURL& url,
-                           scoped_ptr<DistillerPage> distiller_page,
+                           std::unique_ptr<DistillerPage> distiller_page,
                            const DistillationFinishedCallback& finished_cb,
                            const DistillationUpdateCallback& update_cb) = 0;
 };
 
 class DistillerFactory {
  public:
-  virtual scoped_ptr<Distiller> CreateDistillerForUrl(const GURL& url) = 0;
+  virtual std::unique_ptr<Distiller> CreateDistillerForUrl(const GURL& url) = 0;
   virtual ~DistillerFactory() {}
 };
 
 // Factory for creating a Distiller.
 class DistillerFactoryImpl : public DistillerFactory {
  public:
   DistillerFactoryImpl(
-      scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
+      std::unique_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory,
       const dom_distiller::proto::DomDistillerOptions& dom_distiller_options);
   ~DistillerFactoryImpl() override;
-  scoped_ptr<Distiller> CreateDistillerForUrl(const GURL& url) override;
+  std::unique_ptr<Distiller> CreateDistillerForUrl(const GURL& url) override;
 
  private:
-  scoped_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory_;
+  std::unique_ptr<DistillerURLFetcherFactory> distiller_url_fetcher_factory_;
   dom_distiller::proto::DomDistillerOptions dom_distiller_options_;
 };
 
 // Distills a article from a page and associated pages.
 class DistillerImpl : public Distiller {
  public:
   DistillerImpl(
       const DistillerURLFetcherFactory& distiller_url_fetcher_factory,
       const dom_distiller::proto::DomDistillerOptions& dom_distiller_options);
   ~DistillerImpl() override;
 
   void DistillPage(const GURL& url,
-                   scoped_ptr<DistillerPage> distiller_page,
+                   std::unique_ptr<DistillerPage> distiller_page,
                    const DistillationFinishedCallback& finished_cb,
                    const DistillationUpdateCallback& update_cb) override;
 
   void SetMaxNumPagesInArticle(size_t max_num_pages);
 
  private:
   // In case of multiple pages, the Distiller maintains state of multiple pages
   // as page numbers relative to the page number where distillation started.
   // E.g. if distillation starts at page 2 for a 3 page article. The relative
   // page numbers assigned to pages will be [-1,0,1].
@@ skipping 14 matching lines @@
 
   void OnFetchImageDone(int page_num,
                         DistillerURLFetcher* url_fetcher,
                         const std::string& id,
                         const std::string& original_url,
                         const std::string& response);
 
   void OnPageDistillationFinished(
       int page_num,
       const GURL& page_url,
-      scoped_ptr<proto::DomDistillerResult> distilled_page,
+      std::unique_ptr<proto::DomDistillerResult> distilled_page,
       bool distillation_successful);
 
   virtual void FetchImage(int page_num,
                           const std::string& image_id,
                           const std::string& image_url);
 
   // Distills the next page.
   void DistillNextPage();
 
   // Adds the |url| to |pages_to_be_distilled| if |page_num| is a valid relative
@@ skipping 19 matching lines @@
   // all image fetches.
   void AddPageIfDone(int page_num);
 
   DistilledPageData* GetPageAtIndex(size_t index) const;
 
   // Create an ArticleDistillationUpdate for the current distillation
   // state.
   const ArticleDistillationUpdate CreateDistillationUpdate() const;
 
   const DistillerURLFetcherFactory& distiller_url_fetcher_factory_;
-  scoped_ptr<DistillerPage> distiller_page_;
+  std::unique_ptr<DistillerPage> distiller_page_;
 
   dom_distiller::proto::DomDistillerOptions dom_distiller_options_;
   DistillationFinishedCallback finished_cb_;
   DistillationUpdateCallback update_cb_;
 
   // Set of pages that are under distillation or have finished distillation.
   // |started_pages_index_| and |finished_pages_index_| maintains the mapping
   // from page number to the indices in |pages_|.
   ScopedVector<DistilledPageData> pages_;
 
@@ skipping 19 matching lines @@
   bool destruction_allowed_;
 
   base::WeakPtrFactory<DistillerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DistillerImpl);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_