Convert //components/[f-n]* from scoped_ptr to std::unique_ptr

components/favicon/core/favicon_handler_unittest.cc

 // Copyright (c) 2012 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/favicon/core/favicon_handler.h"
 
-#include<set>
-#include<vector>
-
 #include <stddef.h>
 
+#include <memory>
+#include <set>
+#include <vector>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/favicon/core/favicon_driver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 namespace favicon {
 namespace {
@@ skipping 99 matching lines @@
           image_sizes(sizes),
           max_image_size(max_size) {}
     ~Download() {}
     int download_id;
     GURL image_url;
     std::vector<int> image_sizes;
     int max_image_size;
   };
 
   FaviconHandler* favicon_handler_;
-  scoped_ptr<Download> download_;
+  std::unique_ptr<Download> download_;
   bool callback_invoked_;
 
   // The icon URLs for which the download should fail.
   std::set<GURL> should_fail_download_icon_urls_;
 
   // The icon URLs for which the download did fail. This should be a subset of
   // |should_fail_download_icon_urls_|.
   std::set<GURL> failed_download_icon_urls_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadHandler);
@@ skipping 218 matching lines @@
   bool ShouldSaveFavicon() override { return true; }
 
   GURL page_url_;
 
  private:
 
   // The unique id of a download request. It will be returned to a
   // FaviconHandler.
   int download_id_;
 
-  scoped_ptr<DownloadHandler> download_handler_;
-  scoped_ptr<HistoryRequestHandler> history_handler_;
+  std::unique_ptr<DownloadHandler> download_handler_;
+  std::unique_ptr<HistoryRequestHandler> history_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFaviconHandler);
 };
 
 namespace {
 
 void HistoryRequestHandler::InvokeCallback() {
   if (!callback_.is_null()) {
     callback_.Run(history_results_);
   }
@@ skipping 91 matching lines @@
     // Force the values of the scale factors so that the tests produce the same
     // results on all platforms.
     std::vector<ui::ScaleFactor> scale_factors;
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
     scoped_set_supported_scale_factors_.reset(
         new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
     testing::Test::SetUp();
   }
 
  private:
-  scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
+  std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };
 
 TEST_F(FaviconHandlerTest, GetFaviconFromHistory) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconDriver driver;
   TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
@@ skipping 513 matching lines @@
   helper.set_history_handler(nullptr);
 
   // Simulates download succeed.
   download_handler->InvokeCallback();
   // The downloaded icon should be thrown away as there is favicon update.
   EXPECT_FALSE(helper.history_handler());
 
   download_handler->Reset();
 
   // Simulates getting the icon from history.
-  scoped_ptr<HistoryRequestHandler> handler;
+  std::unique_ptr<HistoryRequestHandler> handler;
   handler.reset(new HistoryRequestHandler(
       page_url, latest_icon_url, favicon_base::TOUCH_ICON, callback));
   SetFaviconRawBitmapResult(latest_icon_url,
                             favicon_base::TOUCH_ICON,
                             false /* expired */,
                             &handler->history_results_);
   handler->InvokeCallback();
 
   // No download request.
   EXPECT_FALSE(download_handler->HasDownload());
@@ skipping 684 matching lines @@
   handler1.download_handler()->Reset();
 
   // Verify icon2 has been saved into history.
   EXPECT_EQ(kSourceIconURLs[1].icon_url, handler1.history_handler()->icon_url_);
   EXPECT_EQ(gfx::Size(actual_size2, actual_size2),
             handler1.history_handler()->size_);
 }
 
 }  // namespace
 }  // namespace favicon