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

components/dom_distiller/content/browser/distiller_page_web_contents.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/content/browser/distiller_page_web_contents.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/dom_distiller_constants.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 10 matching lines @@
     bool owned)
     : web_contents_(web_contents), owned_(owned) {
 }
 
 SourcePageHandleWebContents::~SourcePageHandleWebContents() {
   if (owned_) {
     delete web_contents_;
   }
 }
 
-scoped_ptr<DistillerPage> DistillerPageWebContentsFactory::CreateDistillerPage(
+std::unique_ptr<DistillerPage>
+DistillerPageWebContentsFactory::CreateDistillerPage(
     const gfx::Size& render_view_size) const {
   DCHECK(browser_context_);
-  return scoped_ptr<DistillerPage>(new DistillerPageWebContents(
+  return std::unique_ptr<DistillerPage>(new DistillerPageWebContents(
       browser_context_, render_view_size,
-      scoped_ptr<SourcePageHandleWebContents>()));
+      std::unique_ptr<SourcePageHandleWebContents>()));
 }
 
-scoped_ptr<DistillerPage>
+std::unique_ptr<DistillerPage>
 DistillerPageWebContentsFactory::CreateDistillerPageWithHandle(
-    scoped_ptr<SourcePageHandle> handle) const {
+    std::unique_ptr<SourcePageHandle> handle) const {
   DCHECK(browser_context_);
-  scoped_ptr<SourcePageHandleWebContents> web_contents_handle =
-      scoped_ptr<SourcePageHandleWebContents>(
+  std::unique_ptr<SourcePageHandleWebContents> web_contents_handle =
+      std::unique_ptr<SourcePageHandleWebContents>(
           static_cast<SourcePageHandleWebContents*>(handle.release()));
-  return scoped_ptr<DistillerPage>(new DistillerPageWebContents(
+  return std::unique_ptr<DistillerPage>(new DistillerPageWebContents(
       browser_context_, gfx::Size(), std::move(web_contents_handle)));
 }
 
 DistillerPageWebContents::DistillerPageWebContents(
     content::BrowserContext* browser_context,
     const gfx::Size& render_view_size,
-    scoped_ptr<SourcePageHandleWebContents> optional_web_contents_handle)
+    std::unique_ptr<SourcePageHandleWebContents> optional_web_contents_handle)
     : state_(IDLE),
       source_page_handle_(nullptr),
       browser_context_(browser_context),
       render_view_size_(render_view_size),
       weak_factory_(this) {
   if (optional_web_contents_handle) {
     source_page_handle_ = std::move(optional_web_contents_handle);
     if (render_view_size.IsEmpty())
       render_view_size_ =
           source_page_handle_->web_contents()->GetContainerBounds().size();
@@ skipping 85 matching lines @@
 void DistillerPageWebContents::DidFailLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     int error_code,
     const base::string16& error_description,
     bool was_ignored_by_handler) {
   if (!render_frame_host->GetParent()) {
     content::WebContentsObserver::Observe(NULL);
     DCHECK(state_ == LOADING_PAGE || state_ == EXECUTING_JAVASCRIPT);
     state_ = PAGELOAD_FAILED;
-    scoped_ptr<base::Value> empty = base::Value::CreateNullValue();
+    std::unique_ptr<base::Value> empty = base::Value::CreateNullValue();
     OnWebContentsDistillationDone(GURL(), base::TimeTicks(), empty.get());
   }
 }
 
 void DistillerPageWebContents::ExecuteJavaScript() {
   content::RenderFrameHost* frame =
       source_page_handle_->web_contents()->GetMainFrame();
   DCHECK(frame);
   DCHECK_EQ(LOADING_PAGE, state_);
   state_ = EXECUTING_JAVASCRIPT;
@@ skipping 21 matching lines @@
   if (!javascript_start.is_null()) {
     base::TimeDelta javascript_time = base::TimeTicks::Now() - javascript_start;
     UMA_HISTOGRAM_TIMES("DomDistiller.Time.RunJavaScript", javascript_time);
     DVLOG(1) << "DomDistiller.Time.RunJavaScript = " << javascript_time;
   }
 
   DistillerPage::OnDistillationDone(page_url, value);
 }
 
 }  // namespace dom_distiller