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

components/dom_distiller/core/distiller_unittest.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 <stddef.h>
+
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/fake_distiller_page.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
@@ skipping 22 matching lines @@
 const char* kImageURLs[kTotalImages] = {"http://a.com/img1.jpg",
                                         "http://a.com/img2.jpg",
                                         "./bad_url_should_fail"};
 const char* kImageData[kTotalImages] = {"abcde", "12345", "VWXYZ"};
 const char kDebugLog[] = "Debug Log";
 
 const string GetImageName(int page_num, int image_num) {
   return base::IntToString(page_num) + "_" + base::IntToString(image_num);
 }
 
-scoped_ptr<base::Value> CreateDistilledValueReturnedFromJS(
+std::unique_ptr<base::Value> CreateDistilledValueReturnedFromJS(
     const string& title,
     const string& content,
     const vector<int>& image_indices,
     const string& next_page_url,
     const string& prev_page_url = "") {
   DomDistillerResult result;
   result.set_title(title);
   result.mutable_distilled_content()->set_html(content);
   result.mutable_pagination_info()->set_next_page(next_page_url);
   result.mutable_pagination_info()->set_prev_page(prev_page_url);
@@ skipping 78 matching lines @@
 string GenerateNextPageUrl(const std::string& url_prefix, size_t page_num,
     size_t pages_size) {
   return page_num + 1 < pages_size ?
       url_prefix + base::SizeTToString(page_num + 1) : "";
 }
 
 string GeneratePrevPageUrl(const std::string& url_prefix, size_t page_num) {
   return page_num > 0 ? url_prefix + base::SizeTToString(page_num - 1) : "";
 }
 
-scoped_ptr<MultipageDistillerData> CreateMultipageDistillerDataWithoutImages(
-    size_t pages_size) {
-  scoped_ptr<MultipageDistillerData> result(new MultipageDistillerData());
+std::unique_ptr<MultipageDistillerData>
+CreateMultipageDistillerDataWithoutImages(size_t pages_size) {
+  std::unique_ptr<MultipageDistillerData> result(new MultipageDistillerData());
   string url_prefix = kURL;
   for (size_t page_num = 0; page_num < pages_size; ++page_num) {
     result->page_urls.push_back(url_prefix + base::SizeTToString(page_num));
     result->content.push_back("Content for page:" +
                               base::SizeTToString(page_num));
     result->image_ids.push_back(vector<int>());
     string next_page_url =
         GenerateNextPageUrl(url_prefix, page_num, pages_size);
     string prev_page_url =
         GeneratePrevPageUrl(url_prefix, page_num);
-    scoped_ptr<base::Value> distilled_value =
-        CreateDistilledValueReturnedFromJS(kTitle,
-                                           result->content[page_num],
+    std::unique_ptr<base::Value> distilled_value =
+        CreateDistilledValueReturnedFromJS(kTitle, result->content[page_num],
                                            result->image_ids[page_num],
-                                           next_page_url,
-                                           prev_page_url);
+                                           next_page_url, prev_page_url);
     result->distilled_values.push_back(distilled_value.release());
   }
   return result;
 }
 
 void VerifyArticleProtoMatchesMultipageData(
     const dom_distiller::DistilledArticleProto* article_proto,
     const MultipageDistillerData* distiller_data,
     size_t distilled_pages_size,
     size_t total_pages_size) {
@@ skipping 79 matching lines @@
   MockDistillerURLFetcherFactory() : DistillerURLFetcherFactory(NULL) {}
   virtual ~MockDistillerURLFetcherFactory() {}
 
   MOCK_CONST_METHOD0(CreateDistillerURLFetcher, DistillerURLFetcher*());
 };
 
 class DistillerTest : public testing::Test {
  public:
   ~DistillerTest() override {}
 
-  void OnDistillArticleDone(scoped_ptr<DistilledArticleProto> proto) {
+  void OnDistillArticleDone(std::unique_ptr<DistilledArticleProto> proto) {
     article_proto_ = std::move(proto);
   }
 
   void OnDistillArticleUpdate(const ArticleDistillationUpdate& article_update) {
     in_sequence_updates_.push_back(article_update);
   }
 
   void DistillPage(const std::string& url,
-                   scoped_ptr<DistillerPage> distiller_page) {
+                   std::unique_ptr<DistillerPage> distiller_page) {
     distiller_->DistillPage(GURL(url), std::move(distiller_page),
                             base::Bind(&DistillerTest::OnDistillArticleDone,
                                        base::Unretained(this)),
                             base::Bind(&DistillerTest::OnDistillArticleUpdate,
                                        base::Unretained(this)));
   }
 
  protected:
-  scoped_ptr<DistillerImpl> distiller_;
-  scoped_ptr<DistilledArticleProto> article_proto_;
+  std::unique_ptr<DistillerImpl> distiller_;
+  std::unique_ptr<DistilledArticleProto> article_proto_;
   std::vector<ArticleDistillationUpdate> in_sequence_updates_;
   MockDistillerPageFactory page_factory_;
   TestDistillerURLFetcherFactory url_fetcher_factory_;
 };
 
 ACTION_P3(DistillerPageOnDistillationDone, distiller_page, url, result) {
   distiller_page->OnDistillationDone(url, result);
 }
 
-scoped_ptr<DistillerPage> CreateMockDistillerPage(const base::Value* result,
-                                                  const GURL& url) {
+std::unique_ptr<DistillerPage> CreateMockDistillerPage(
+    const base::Value* result,
+    const GURL& url) {
   MockDistillerPage* distiller_page = new MockDistillerPage();
   EXPECT_CALL(*distiller_page, DistillPageImpl(url, _))
       .WillOnce(DistillerPageOnDistillationDone(distiller_page, url, result));
-  return scoped_ptr<DistillerPage>(distiller_page);
+  return std::unique_ptr<DistillerPage>(distiller_page);
 }
 
-scoped_ptr<DistillerPage> CreateMockDistillerPageWithPendingJSCallback(
+std::unique_ptr<DistillerPage> CreateMockDistillerPageWithPendingJSCallback(
     MockDistillerPage** distiller_page_ptr,
     const GURL& url) {
   MockDistillerPage* distiller_page = new MockDistillerPage();
   *distiller_page_ptr = distiller_page;
   EXPECT_CALL(*distiller_page, DistillPageImpl(url, _));
-  return scoped_ptr<DistillerPage>(distiller_page);
+  return std::unique_ptr<DistillerPage>(distiller_page);
 }
 
-scoped_ptr<DistillerPage> CreateMockDistillerPages(
+std::unique_ptr<DistillerPage> CreateMockDistillerPages(
     MultipageDistillerData* distiller_data,
     size_t pages_size,
     int start_page_num) {
   MockDistillerPage* distiller_page = new MockDistillerPage();
   {
     testing::InSequence s;
     vector<int> page_nums = GetPagesInSequence(start_page_num, pages_size);
     for (size_t page_num = 0; page_num < pages_size; ++page_num) {
       int page = page_nums[page_num];
       GURL url = GURL(distiller_data->page_urls[page]);
       EXPECT_CALL(*distiller_page, DistillPageImpl(url, _))
           .WillOnce(DistillerPageOnDistillationDone(
               distiller_page, url, distiller_data->distilled_values[page]));
     }
   }
-  return scoped_ptr<DistillerPage>(distiller_page);
+  return std::unique_ptr<DistillerPage>(distiller_page);
 }
 
 TEST_F(DistillerTest, DistillPage) {
   base::MessageLoopForUI loop;
-  scoped_ptr<base::Value> result =
+  std::unique_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), "");
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   ASSERT_EQ(article_proto_->pages_size(), 1);
   const DistilledPageProto& first_page = article_proto_->pages(0);
   EXPECT_EQ(kContent, first_page.html());
   EXPECT_EQ(kURL, first_page.url());
 }
 
 TEST_F(DistillerTest, DistillPageWithDebugInfo) {
   base::MessageLoopForUI loop;
   DomDistillerResult dd_result;
   dd_result.mutable_debug_info()->set_log(kDebugLog);
-  scoped_ptr<base::Value> result =
+  std::unique_ptr<base::Value> result =
       dom_distiller::proto::json::DomDistillerResult::WriteToValue(dd_result);
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   const DistilledPageProto& first_page = article_proto_->pages(0);
   EXPECT_EQ(kDebugLog, first_page.debug_info().log());
 }
 
 void SetTimingEntry(TimingEntry* entry, const std::string& name, double time) {
   entry->set_name(name);
   entry->set_time(time);
 }
 
 TEST_F(DistillerTest, DistillPageWithTimingInfo) {
   base::MessageLoopForUI loop;
   DomDistillerResult dd_result;
   dd_result.mutable_timing_info()->set_total_time(1.0);
   dd_result.mutable_timing_info()->set_markup_parsing_time(2.0);
   dd_result.mutable_timing_info()->set_document_construction_time(3.0);
   dd_result.mutable_timing_info()->set_article_processing_time(4.0);
   dd_result.mutable_timing_info()->set_formatting_time(5.0);
   SetTimingEntry(
       dd_result.mutable_timing_info()->add_other_times(), "time0", 6.0);
   SetTimingEntry(
       dd_result.mutable_timing_info()->add_other_times(), "time1", 7.0);
-  scoped_ptr<base::Value> result =
+  std::unique_ptr<base::Value> result =
       dom_distiller::proto::json::DomDistillerResult::WriteToValue(dd_result);
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   const DistilledPageProto& first_page = article_proto_->pages(0);
   std::map<std::string, double> timings;
   for (int i = 0; i < first_page.timing_info_size(); ++i) {
     DistilledPageProto::TimingInfo timing = first_page.timing_info(i);
     timings[timing.name()] = timing.time();
   }
   EXPECT_EQ(7u, timings.size());
   EXPECT_EQ(1.0, timings["total"]);
   EXPECT_EQ(2.0, timings["markup_parsing"]);
   EXPECT_EQ(3.0, timings["document_construction"]);
   EXPECT_EQ(4.0, timings["article_processing"]);
   EXPECT_EQ(5.0, timings["formatting"]);
   EXPECT_EQ(6.0, timings["time0"]);
   EXPECT_EQ(7.0, timings["time1"]);
 }
 
 TEST_F(DistillerTest, DistillPageWithImages) {
   base::MessageLoopForUI loop;
   vector<int> image_indices;
   image_indices.push_back(0);
   image_indices.push_back(1);
   image_indices.push_back(2);
-  scoped_ptr<base::Value> result =
+  std::unique_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, image_indices, "");
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   ASSERT_EQ(article_proto_->pages_size(), 1);
   const DistilledPageProto& first_page = article_proto_->pages(0);
   EXPECT_EQ(kContent, first_page.html());
   EXPECT_EQ(kURL, first_page.url());
   ASSERT_EQ(2, first_page.image_size());
   EXPECT_EQ(kImageData[0], first_page.image(0).data());
   EXPECT_EQ(kImageURLs[0], first_page.image(0).url());
   EXPECT_EQ(GetImageName(1, 0), first_page.image(0).name());
   EXPECT_EQ(kImageData[1], first_page.image(1).data());
   EXPECT_EQ(kImageURLs[1], first_page.image(1).url());
   EXPECT_EQ(GetImageName(1, 1), first_page.image(1).name());
 }
 
 TEST_F(DistillerTest, DistillMultiplePages) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
 
   // Add images.
   int next_image_number = 0;
   for (size_t page_num = 0; page_num < kNumPages; ++page_num) {
     // Each page has different number of images.
     size_t tot_images = (page_num + kTotalImages) % (kTotalImages + 1);
     vector<int> image_indices;
     for (size_t img_num = 0; img_num < tot_images; img_num++) {
       image_indices.push_back(next_image_number);
       next_image_number = (next_image_number + 1) % kTotalImages;
     }
     distiller_data->image_ids.push_back(image_indices);
   }
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(distiller_data->page_urls[0],
               CreateMockDistillerPages(distiller_data.get(), kNumPages, 0));
   base::MessageLoop::current()->RunUntilIdle();
   VerifyArticleProtoMatchesMultipageData(
       article_proto_.get(), distiller_data.get(), kNumPages, kNumPages);
 }
 
 TEST_F(DistillerTest, DistillLinkLoop) {
   base::MessageLoopForUI loop;
   // Create a loop, the next page is same as the current page. This could
   // happen if javascript misparses a next page link.
-  scoped_ptr<base::Value> result =
+  std::unique_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), kURL);
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(article_proto_->pages_size(), 1);
 }
 
 TEST_F(DistillerTest, CheckMaxPageLimitExtraPage) {
   base::MessageLoopForUI loop;
   const size_t kMaxPagesInArticle = 10;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kMaxPagesInArticle);
 
   // Note: Next page url of the last page of article is set. So distiller will
   // try to do kMaxPagesInArticle + 1 calls if the max article limit does not
   // work.
-  scoped_ptr<base::Value> last_page_data =
+  std::unique_ptr<base::Value> last_page_data =
       CreateDistilledValueReturnedFromJS(
-          kTitle,
-          distiller_data->content[kMaxPagesInArticle - 1],
-          vector<int>(),
-          "",
-          distiller_data->page_urls[kMaxPagesInArticle - 2]);
+          kTitle, distiller_data->content[kMaxPagesInArticle - 1],
+          vector<int>(), "", distiller_data->page_urls[kMaxPagesInArticle - 2]);
 
   distiller_data->distilled_values.pop_back();
   distiller_data->distilled_values.push_back(last_page_data.release());
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
 
   distiller_->SetMaxNumPagesInArticle(kMaxPagesInArticle);
 
   DistillPage(
       distiller_data->page_urls[0],
       CreateMockDistillerPages(distiller_data.get(), kMaxPagesInArticle, 0));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(kMaxPagesInArticle,
             static_cast<size_t>(article_proto_->pages_size()));
 }
 
 TEST_F(DistillerTest, CheckMaxPageLimitExactLimit) {
   base::MessageLoopForUI loop;
   const size_t kMaxPagesInArticle = 10;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kMaxPagesInArticle);
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
 
   // Check if distilling an article with exactly the page limit works.
   distiller_->SetMaxNumPagesInArticle(kMaxPagesInArticle);
 
   DistillPage(
       distiller_data->page_urls[0],
       CreateMockDistillerPages(distiller_data.get(), kMaxPagesInArticle, 0));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(kMaxPagesInArticle,
             static_cast<size_t>(article_proto_->pages_size()));
 }
 
 TEST_F(DistillerTest, SinglePageDistillationFailure) {
   base::MessageLoopForUI loop;
   // To simulate failure return a null value.
-  scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
+  std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(null_value.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ("", article_proto_->title());
   EXPECT_EQ(0, article_proto_->pages_size());
 }
 
 TEST_F(DistillerTest, MultiplePagesDistillationFailure) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
 
   // The page number of the failed page.
   size_t failed_page_num = 3;
   // reset distilled data of the failed page.
   distiller_data->distilled_values.erase(
       distiller_data->distilled_values.begin() + failed_page_num);
   distiller_data->distilled_values.insert(
       distiller_data->distilled_values.begin() + failed_page_num,
       base::Value::CreateNullValue().release());
   // Expect only calls till the failed page number.
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(
       distiller_data->page_urls[0],
       CreateMockDistillerPages(distiller_data.get(), failed_page_num + 1, 0));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   VerifyArticleProtoMatchesMultipageData(
       article_proto_.get(), distiller_data.get(), failed_page_num, kNumPages);
 }
 
 TEST_F(DistillerTest, DistillPreviousPage) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
 
   // The page number of the article on which distillation starts.
   int start_page_num = 3;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(distiller_data->page_urls[start_page_num],
               CreateMockDistillerPages(distiller_data.get(), kNumPages,
                                        start_page_num));
   base::MessageLoop::current()->RunUntilIdle();
   VerifyArticleProtoMatchesMultipageData(
       article_proto_.get(), distiller_data.get(), kNumPages, kNumPages);
 }
 
 TEST_F(DistillerTest, IncrementalUpdates) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
 
   // The page number of the article on which distillation starts.
   int start_page_num = 3;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(distiller_data->page_urls[start_page_num],
               CreateMockDistillerPages(distiller_data.get(), kNumPages,
                                        start_page_num));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   ASSERT_EQ(kNumPages, static_cast<size_t>(article_proto_->pages_size()));
   EXPECT_EQ(kNumPages, in_sequence_updates_.size());
 
   VerifyIncrementalUpdatesMatch(
       distiller_data.get(), kNumPages, in_sequence_updates_, start_page_num);
 }
 
 TEST_F(DistillerTest, IncrementalUpdatesDoNotDeleteFinalArticle) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
   int start_page_num = 3;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(distiller_data->page_urls[start_page_num],
               CreateMockDistillerPages(distiller_data.get(), kNumPages,
                                        start_page_num));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kNumPages, in_sequence_updates_.size());
 
   in_sequence_updates_.clear();
 
   // Should still be able to access article and pages.
   VerifyArticleProtoMatchesMultipageData(
       article_proto_.get(), distiller_data.get(), kNumPages, kNumPages);
 }
 
 TEST_F(DistillerTest, DeletingArticleDoesNotInterfereWithUpdates) {
   base::MessageLoopForUI loop;
   const size_t kNumPages = 8;
-  scoped_ptr<MultipageDistillerData> distiller_data =
+  std::unique_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kNumPages);
   // The page number of the article on which distillation starts.
   int start_page_num = 3;
 
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(distiller_data->page_urls[start_page_num],
               CreateMockDistillerPages(distiller_data.get(), kNumPages,
                                        start_page_num));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kNumPages, in_sequence_updates_.size());
   EXPECT_EQ(kTitle, article_proto_->title());
   ASSERT_EQ(kNumPages, static_cast<size_t>(article_proto_->pages_size()));
 
   // Delete the article.
   article_proto_.reset();
   VerifyIncrementalUpdatesMatch(
       distiller_data.get(), kNumPages, in_sequence_updates_, start_page_num);
 }
 
 TEST_F(DistillerTest, CancelWithDelayedImageFetchCallback) {
   base::MessageLoopForUI loop;
   vector<int> image_indices;
   image_indices.push_back(0);
-  scoped_ptr<base::Value> distilled_value =
+  std::unique_ptr<base::Value> distilled_value =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, image_indices, "");
   TestDistillerURLFetcher* delayed_fetcher = new TestDistillerURLFetcher(true);
   MockDistillerURLFetcherFactory mock_url_fetcher_factory;
   EXPECT_CALL(mock_url_fetcher_factory, CreateDistillerURLFetcher())
       .WillOnce(Return(delayed_fetcher));
   distiller_.reset(
       new DistillerImpl(mock_url_fetcher_factory, DomDistillerOptions()));
   DistillPage(kURL, CreateMockDistillerPage(distilled_value.get(), GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
 
   // Post callback from the url fetcher and then delete the distiller.
   delayed_fetcher->PostCallbackTask();
   distiller_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 TEST_F(DistillerTest, CancelWithDelayedJSCallback) {
   base::MessageLoopForUI loop;
-  scoped_ptr<base::Value> distilled_value =
+  std::unique_ptr<base::Value> distilled_value =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), "");
   MockDistillerPage* distiller_page = NULL;
   distiller_.reset(
       new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
   DistillPage(kURL,
               CreateMockDistillerPageWithPendingJSCallback(&distiller_page,
                                                            GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
 
   ASSERT_TRUE(distiller_page);
   // Post the task to execute javascript and then delete the distiller.
   distiller_page->OnDistillationDone(GURL(kURL), distilled_value.get());
   distiller_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace dom_distiller