Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(814)

Unified Diff: chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc
diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc
index babed7e814d1bdea68f12cee53226aa43a5aa9e5..a7d45ba642f8c86c3732266b55511126be4554b4 100644
--- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc
+++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h"
#include "extensions/common/manifest_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -96,8 +97,8 @@ class FakeErrorReporter : public ErrorReporter {
const std::string& GetLastWarningMessage() { return *last_message_.get(); }
- scoped_ptr<ErrorReporter> Duplicate() override {
- return make_scoped_ptr(new FakeErrorReporter(last_message_));
+ std::unique_ptr<ErrorReporter> Duplicate() override {
+ return base::WrapUnique(new FakeErrorReporter(last_message_));
}
private:
@@ -134,8 +135,8 @@ class LauncherSearchIconImageLoaderTest : public testing::Test {
protected:
void SetUp() override { extension_ = CreateTestExtension(kTestExtensionId); }
- scoped_ptr<FakeErrorReporter> GetFakeErrorReporter() {
- return make_scoped_ptr(new FakeErrorReporter());
+ std::unique_ptr<FakeErrorReporter> GetFakeErrorReporter() {
+ return base::WrapUnique(new FakeErrorReporter());
}
scoped_refptr<extensions::Extension> extension_;
@@ -214,7 +215,8 @@ TEST_F(LauncherSearchIconImageLoaderTest, InvalidCustomIconUrl) {
"1";
ASSERT_EQ(101U, invalid_url.size());
- scoped_ptr<FakeErrorReporter> fake_error_reporter = GetFakeErrorReporter();
+ std::unique_ptr<FakeErrorReporter> fake_error_reporter =
+ GetFakeErrorReporter();
GURL icon_url(invalid_url);
LauncherSearchIconImageLoaderTestImpl impl(icon_url, nullptr,
extension_.get(), 32,
@@ -234,7 +236,8 @@ TEST_F(LauncherSearchIconImageLoaderTest, InvalidCustomIconUrl) {
}
TEST_F(LauncherSearchIconImageLoaderTest, FailedToLoadCustomIcon) {
- scoped_ptr<FakeErrorReporter> fake_error_reporter = GetFakeErrorReporter();
+ std::unique_ptr<FakeErrorReporter> fake_error_reporter =
+ GetFakeErrorReporter();
GURL icon_url(kTestCustomIconURL);
LauncherSearchIconImageLoaderTestImpl impl(icon_url, nullptr,
extension_.get(), 32,

Powered by Google App Engine
This is Rietveld 408576698