[Android Webapps] Make AddToHomescreenDataFetcher easier to test

chrome/browser/android/webapps/add_to_homescreen_data_fetcher_unittest.cc

 // Copyright 2016 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 "chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <memory>
 #include <string>
 
 #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"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/installable/installable_manager.h"
 #include "chrome/common/web_application_info.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ skipping 106 matching lines @@
     determined_webapk_compatibility_ = true;
     is_webapk_compatible_ = is_webapk_compatible;
   }
 
   void OnUserTitleAvailable(const base::string16& title) override {
     EXPECT_FALSE(data_available_);
     title_available_ = true;
     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 {
     EXPECT_TRUE(title_available_);
     data_available_ = true;
     if (!quit_closure_.is_null())
       quit_closure_.Run();
   }
 
   base::string16 title() const { return title_; }
@@ skipping 68 matching lines @@
     InstallableManager::CreateForWebContents(mock_web_contents);
     SetContents(mock_web_contents);
     NavigateAndCommit(GURL(kDefaultStartUrl));
   }
 
   void TearDown() override {
     embedded_worker_test_helper_.reset();
     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().
   void SetManifest(const GURL& manifest_url,
                    const content::Manifest& manifest) {
     MockWebContents* mock_web_contents =
         static_cast<MockWebContents*>(web_contents());
     mock_web_contents->SetManifest(manifest_url, manifest);
   }
 
@@ skipping 39 matching lines @@
 
 // Class for tests which should be run with AddToHomescreenDataFetcher built
 // with both true and false values of |check_webapk_compatible|.
 class AddToHomescreenDataFetcherTestCommon
     : public AddToHomescreenDataFetcherTest,
       public testing::WithParamInterface<bool> {
  public:
   AddToHomescreenDataFetcherTestCommon() {}
   ~AddToHomescreenDataFetcherTestCommon() override {}
 
-  scoped_refptr<AddToHomescreenDataFetcher> BuildFetcher(
+  std::unique_ptr<AddToHomescreenDataFetcher> BuildFetcher(
       AddToHomescreenDataFetcher::Observer* observer) {
     return AddToHomescreenDataFetcherTest::BuildFetcher(
         check_webapk_compatibility(), observer);
   }
 
   // The value of |check_webapk_compatible| used when building the
   // AddToHomescreenDataFetcher.
   bool check_webapk_compatibility() { return GetParam(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AddToHomescreenDataFetcherTestCommon);
 };
 
 // Checks that AddToHomescreenDataFetcher::Observer::OnUserTitleAvailable() is
 // called when the web manifest returned is empty. The add-to-homescreen dialog
 // makes the dialog's text field editable once OnUserTitleAvailable() is called.
 TEST_P(AddToHomescreenDataFetcherTestCommon, EmptyManifest) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   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();
 
   EXPECT_EQ(check_webapk_compatibility(),
             waiter.determined_webapk_compatibility());
   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
 // Manifest::name that Manifest::short_name is used as the name instead of
 // WebApplicationInfo::title.
 TEST_P(AddToHomescreenDataFetcherTestCommon,
        ManifestShortNameClobbersWebApplicationName) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   content::Manifest manifest(BuildDefaultManifest());
   manifest.name = base::NullableString16();
 
   RegisterServiceWorker(GURL(kDefaultStartUrl));
   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
 // Manifest::name that:
 // - The page is not WebAPK compatible.
 // - WebApplicationInfo::title is used as the "name".
 TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestNoNameNoShortName) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   content::Manifest manifest(BuildDefaultManifest());
   manifest.name = base::NullableString16();
   manifest.short_name = base::NullableString16();
 
   RegisterServiceWorker(GURL(kDefaultStartUrl));
   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_EQ(check_webapk_compatibility(),
             waiter.determined_webapk_compatibility());
   EXPECT_FALSE(waiter.is_webapk_compatible());
   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
 // when the manifest fetch times out.
 TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestFetchTimesOut) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   RegisterServiceWorker(GURL(kDefaultStartUrl));
   SetManifest(GURL(kDefaultManifestUrl), BuildDefaultManifest());
   SetShouldManifestTimeOut(true);
   SetShouldImageTimeOut(false);
 
   ObserverWaiter waiter;
-  scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
+  std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter);
   fetcher->OnDidGetWebApplicationInfo(web_application_info);
   waiter.WaitForDataAvailable();
 
   EXPECT_EQ(check_webapk_compatibility(),
             waiter.determined_webapk_compatibility());
   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
 // when the image fetch times out.
 TEST_P(AddToHomescreenDataFetcherTestCommon, ImageFetchTimesOut) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   RegisterServiceWorker(GURL(kDefaultStartUrl));
   SetManifest(GURL(kDefaultManifestUrl), BuildDefaultManifest());
   SetShouldManifestTimeOut(false);
   SetShouldImageTimeOut(true);
 
   ObserverWaiter waiter;
-  scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
+  std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter);
   fetcher->OnDidGetWebApplicationInfo(web_application_info);
   waiter.WaitForDataAvailable();
 
   EXPECT_EQ(check_webapk_compatibility(),
             waiter.determined_webapk_compatibility());
   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
 // when the service worker check times out.
 TEST_P(AddToHomescreenDataFetcherTestCommon, ServiceWorkerCheckTimesOut) {
   WebApplicationInfo web_application_info;
   web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
 
   // Not registering a service worker means we'll wait and time out for the
   // worker.
   SetManifest(GURL(kDefaultManifestUrl), BuildDefaultManifest());
   SetShouldManifestTimeOut(false);
   SetShouldImageTimeOut(false);
 
   ObserverWaiter waiter;
-  scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
+  std::unique_ptr<AddToHomescreenDataFetcher> fetcher = BuildFetcher(&waiter);
   fetcher->OnDidGetWebApplicationInfo(web_application_info);
   waiter.WaitForDataAvailable();
 
   EXPECT_EQ(check_webapk_compatibility(),
             waiter.determined_webapk_compatibility());
   EXPECT_FALSE(waiter.is_webapk_compatible());
   EXPECT_TRUE(waiter.title_available());
   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,
                         AddToHomescreenDataFetcherTestCommon,
                         ::testing::Values(false, true));