Index: chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc |
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc |
index ebe6b852474512e45d248f019add558b189a8fd1..bb5c76130f241855024b8f14e678abfefe11d43b 100644 |
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc |
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc |
@@ -10,6 +10,7 @@ |
#include "base/callback_forward.h" |
#include "base/files/file_path.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/ref_counted.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
@@ -136,13 +137,6 @@ class ObserverWaiter : public AddToHomescreenDataFetcher::Observer { |
title_ = title; |
} |
- SkBitmap FinalizeLauncherIconInBackground(const SkBitmap& icon, |
- const GURL& url, |
- bool* is_generated) override { |
- *is_generated = false; |
- return icon; |
- } |
- |
void OnDataAvailable(const ShortcutInfo& info, |
const SkBitmap& primary_icon, |
const SkBitmap& badge_icon) override { |
@@ -231,11 +225,11 @@ class AddToHomescreenDataFetcherTest : public ChromeRenderViewHostTestHarness { |
ChromeRenderViewHostTestHarness::TearDown(); |
} |
- scoped_refptr<AddToHomescreenDataFetcher> BuildFetcher( |
+ std::unique_ptr<AddToHomescreenDataFetcher> BuildFetcher( |
bool check_webapk_compatible, |
AddToHomescreenDataFetcher::Observer* observer) { |
- return new AddToHomescreenDataFetcher(web_contents(), 1, 1, 1, 1, 1, 500, |
- check_webapk_compatible, observer); |
+ return base::MakeUnique<AddToHomescreenDataFetcher>( |
+ web_contents(), 1, 1, 1, 1, 1, 500, check_webapk_compatible, observer); |
} |
// Set the manifest to be returned as a result of WebContents::GetManifest(). |
@@ -295,7 +289,7 @@ class AddToHomescreenDataFetcherTestCommon |
AddToHomescreenDataFetcherTestCommon() {} |
~AddToHomescreenDataFetcherTestCommon() override {} |
- scoped_refptr<AddToHomescreenDataFetcher> BuildFetcher( |
+ std::unique_ptr<AddToHomescreenDataFetcher> BuildFetcher( |
AddToHomescreenDataFetcher::Observer* observer) { |
return AddToHomescreenDataFetcherTest::BuildFetcher( |
check_webapk_compatibility(), observer); |
@@ -319,7 +313,7 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, EmptyManifest) { |
SetManifest(GURL(kDefaultManifestUrl), BuildEmptyManifest()); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
@@ -328,8 +322,6 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, EmptyManifest) { |
EXPECT_FALSE(waiter.is_webapk_compatible()); |
EXPECT_TRUE(waiter.title_available()); |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kWebApplicationInfoTitle)); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
// Test that when the manifest provides Manifest::short_name but not |
@@ -347,15 +339,13 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, |
SetManifest(GURL(kDefaultManifestUrl), manifest); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kDefaultManifestShortName)); |
EXPECT_TRUE(base::EqualsASCII(fetcher->shortcut_info().name, |
kDefaultManifestShortName)); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
// Test that when the manifest does not provide either Manifest::short_name nor |
@@ -374,7 +364,7 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestNoNameNoShortName) { |
SetManifest(GURL(kDefaultManifestUrl), manifest); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
@@ -384,8 +374,6 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestNoNameNoShortName) { |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kWebApplicationInfoTitle)); |
EXPECT_TRUE(base::EqualsASCII(fetcher->shortcut_info().name, |
kWebApplicationInfoTitle)); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
// Checks that the AddToHomescreenDataFetcher::Observer callbacks are called |
@@ -400,7 +388,7 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestFetchTimesOut) { |
SetShouldImageTimeOut(false); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
@@ -409,8 +397,6 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestFetchTimesOut) { |
EXPECT_FALSE(waiter.is_webapk_compatible()); |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kWebApplicationInfoTitle)); |
EXPECT_TRUE(waiter.title_available()); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
// Checks that the AddToHomescreenDataFetcher::Observer callbacks are called |
@@ -425,7 +411,7 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ImageFetchTimesOut) { |
SetShouldImageTimeOut(true); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
@@ -434,8 +420,6 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ImageFetchTimesOut) { |
EXPECT_FALSE(waiter.is_webapk_compatible()); |
EXPECT_TRUE(waiter.title_available()); |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kWebApplicationInfoTitle)); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
// Checks that the AddToHomescreenDataFetcher::Observer callbacks are called |
@@ -451,7 +435,7 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ServiceWorkerCheckTimesOut) { |
SetShouldImageTimeOut(false); |
ObserverWaiter waiter; |
- scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter)); |
+ std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter); |
fetcher->OnDidGetWebApplicationInfo(web_application_info); |
waiter.WaitForDataAvailable(); |
@@ -462,8 +446,6 @@ TEST_P(AddToHomescreenDataFetcherTestCommon, ServiceWorkerCheckTimesOut) { |
EXPECT_TRUE(base::EqualsASCII(waiter.title(), kDefaultManifestShortName)); |
EXPECT_TRUE(base::EqualsASCII(fetcher->shortcut_info().user_title, |
kDefaultManifestShortName)); |
- |
- fetcher->set_weak_observer(nullptr); |
} |
INSTANTIATE_TEST_CASE_P(CheckWebApkCompatibility, |