desktop-pwas: Remove fake_app_banner_manager and use test_ABM instead.

Just moved all the methods across for now to ensure tests were not
affected by this cleanup change. Some duplication (now within TABM)
could be cleaned up in future.

In prep for making an ABM factory as suggested by bsep@ in
crrev.com/c/2075001

Change-Id: Idcaad639bcc270a7ed3cc1f77f88b0fd5f2366a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2082220
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746196}

chrome/browser/banners/app_banner_manager_desktop_browsertest.cc

@@ -12,12 +12,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/bind_test_util.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/banners/app_banner_manager_browsertest_base.h"
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/banners/test_app_banner_manager_desktop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
@@ -35,78 +35,9 @@
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/extension.h"
 
-namespace {
+namespace banners {
 
-class FakeAppBannerManagerDesktop : public banners::AppBannerManagerDesktop {
- public:
-  explicit FakeAppBannerManagerDesktop(content::WebContents* web_contents)
-      : AppBannerManagerDesktop(web_contents) {
-    MigrateObserverListForTesting(web_contents);
-  }
-
-  static FakeAppBannerManagerDesktop* CreateForWebContents(
-      content::WebContents* web_contents) {
-    auto banner_manager =
-        std::make_unique<FakeAppBannerManagerDesktop>(web_contents);
-    banner_manager->MigrateObserverListForTesting(web_contents);
-
-    FakeAppBannerManagerDesktop* result = banner_manager.get();
-    web_contents->SetUserData(FakeAppBannerManagerDesktop::UserDataKey(),
-                              std::move(banner_manager));
-    return result;
-  }
-
-  // Configures a callback to be invoked when the app banner flow finishes.
-  void PrepareDone(base::OnceClosure on_done) { on_done_ = std::move(on_done); }
-
-  State state() { return AppBannerManager::state(); }
-
-  void AwaitAppInstall() {
-    base::RunLoop loop;
-    on_install_ = loop.QuitClosure();
-    loop.Run();
-  }
-
- protected:
-  void OnInstall(blink::mojom::DisplayMode display) override {
-    AppBannerManager::OnInstall(display);
-    if (on_install_)
-      std::move(on_install_).Run();
-  }
-
-  void OnFinished() {
-    if (on_done_) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                    std::move(on_done_));
-    }
-  }
-
-  void DidFinishCreatingWebApp(const web_app::AppId& app_id,
-                               web_app::InstallResultCode code) override {
-    AppBannerManagerDesktop::DidFinishCreatingWebApp(app_id, code);
-    OnFinished();
-  }
-
-  void UpdateState(AppBannerManager::State state) override {
-    AppBannerManager::UpdateState(state);
-
-    if (state == AppBannerManager::State::PENDING_ENGAGEMENT ||
-        state == AppBannerManager::State::PENDING_PROMPT ||
-        state == AppBannerManager::State::COMPLETE) {
-      OnFinished();
-    }
-  }
-
- private:
-  base::OnceClosure on_done_;
-  base::OnceClosure on_install_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeAppBannerManagerDesktop);
-};
-
-}  // anonymous namespace
-
-using State = banners::AppBannerManager::State;
+using State = AppBannerManager::State;
 
 class AppBannerManagerDesktopBrowserTest
     : public AppBannerManagerBrowserTestBase {
@@ -135,7 +66,7 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   auto* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(web_contents);
+      TestAppBannerManagerDesktop::CreateForWebContents(web_contents);
 
   {
     base::RunLoop run_loop;
@@ -161,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
   content::TitleWatcher watcher(web_contents, title);
   EXPECT_EQ(title, watcher.WaitAndGetTitle());
 
-  tester.ExpectUniqueSample(banners::kInstallDisplayModeHistogram,
+  tester.ExpectUniqueSample(kInstallDisplayModeHistogram,
                             blink::mojom::DisplayMode::kStandalone, 1);
 }
 
@@ -171,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   auto* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(web_contents);
+      TestAppBannerManagerDesktop::CreateForWebContents(web_contents);
 
   {
     base::RunLoop run_loop;
@@ -218,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest, DestroyWebContents) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   auto* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(web_contents);
+      TestAppBannerManagerDesktop::CreateForWebContents(web_contents);
 
   {
     base::RunLoop run_loop;
@@ -260,8 +191,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
                        InstallPromptAfterUserMenuInstall) {
   base::HistogramTester tester;
 
-  FakeAppBannerManagerDesktop* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(
+  TestAppBannerManagerDesktop* manager =
+      TestAppBannerManagerDesktop::CreateForWebContents(
           browser()->tab_strip_model()->GetActiveWebContents());
 
   {
@@ -283,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
 
   EXPECT_FALSE(manager->IsPromptAvailableForTesting());
 
-  tester.ExpectUniqueSample(banners::kInstallDisplayModeHistogram,
+  tester.ExpectUniqueSample(kInstallDisplayModeHistogram,
                             blink::mojom::DisplayMode::kMinimalUi, 1);
 }
 
@@ -291,8 +222,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
                        InstallPromptAfterUserOmniboxInstall) {
   base::HistogramTester tester;
 
-  FakeAppBannerManagerDesktop* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(
+  TestAppBannerManagerDesktop* manager =
+      TestAppBannerManagerDesktop::CreateForWebContents(
           browser()->tab_strip_model()->GetActiveWebContents());
 
   {
@@ -316,14 +247,14 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
 
   EXPECT_FALSE(manager->IsPromptAvailableForTesting());
 
-  tester.ExpectUniqueSample(banners::kInstallDisplayModeHistogram,
+  tester.ExpectUniqueSample(kInstallDisplayModeHistogram,
                             blink::mojom::DisplayMode::kFullscreen, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
                        PolicyAppInstalled_NoPrompt) {
-  FakeAppBannerManagerDesktop* manager =
-      FakeAppBannerManagerDesktop::CreateForWebContents(
+  TestAppBannerManagerDesktop* manager =
+      TestAppBannerManagerDesktop::CreateForWebContents(
           browser()->tab_strip_model()->GetActiveWebContents());
 
   web_app::ExternalInstallOptions options =
@@ -341,7 +272,9 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerDesktopBrowserTest,
     EXPECT_EQ(State::COMPLETE, manager->state());
   }
 
-  EXPECT_EQ(banners::AppBannerManager::InstallableWebAppCheckResult::kNo,
+  EXPECT_EQ(AppBannerManager::InstallableWebAppCheckResult::kNo,
             manager->GetInstallableWebAppCheckResultForTesting());
   EXPECT_FALSE(manager->IsPromptAvailableForTesting());
 }
+
+}  // namespace banners

chrome/browser/banners/test_app_banner_manager_desktop.cc

@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/run_loop.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/installable/installable_logging.h"
 #include "content/public/browser/web_contents.h"
 
@@ -45,6 +46,20 @@ bool TestAppBannerManagerDesktop::WaitForInstallableCheck() {
   return *installable_;
 }
 
+void TestAppBannerManagerDesktop::PrepareDone(base::OnceClosure on_done) {
+  on_done_ = std::move(on_done);
+}
+
+AppBannerManager::State TestAppBannerManagerDesktop::state() {
+  return AppBannerManager::state();
+}
+
+void TestAppBannerManagerDesktop::AwaitAppInstall() {
+  base::RunLoop loop;
+  on_install_ = loop.QuitClosure();
+  loop.Run();
+}
+
 void TestAppBannerManagerDesktop::OnDidGetManifest(
     const InstallableData& result) {
   AppBannerManagerDesktop::OnDidGetManifest(result);
@@ -68,6 +83,29 @@ void TestAppBannerManagerDesktop::ResetCurrentPageData() {
     std::move(tear_down_quit_closure_).Run();
 }
 
+void TestAppBannerManagerDesktop::OnInstall(blink::mojom::DisplayMode display) {
+  AppBannerManager::OnInstall(display);
+  if (on_install_)
+    std::move(on_install_).Run();
+}
+
+void TestAppBannerManagerDesktop::DidFinishCreatingWebApp(
+    const web_app::AppId& app_id,
+    web_app::InstallResultCode code) {
+  AppBannerManagerDesktop::DidFinishCreatingWebApp(app_id, code);
+  OnFinished();
+}
+
+void TestAppBannerManagerDesktop::UpdateState(AppBannerManager::State state) {
+  AppBannerManager::UpdateState(state);
+
+  if (state == AppBannerManager::State::PENDING_ENGAGEMENT ||
+      state == AppBannerManager::State::PENDING_PROMPT ||
+      state == AppBannerManager::State::COMPLETE) {
+    OnFinished();
+  }
+}
+
 void TestAppBannerManagerDesktop::SetInstallable(bool installable) {
   DCHECK(!installable_.has_value());
   installable_ = installable;
@@ -75,4 +113,11 @@ void TestAppBannerManagerDesktop::SetInstallable(bool installable) {
     std::move(installable_quit_closure_).Run();
 }
 
+void TestAppBannerManagerDesktop::OnFinished() {
+  if (on_done_) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+                                                  std::move(on_done_));
+  }
+}
+
 }  // namespace banners

chrome/browser/banners/test_app_banner_manager_desktop.h

@@ -32,18 +32,37 @@ class TestAppBannerManagerDesktop : public AppBannerManagerDesktop {
   // Returns whether the installable check passed.
   bool WaitForInstallableCheck();
 
+  // Configures a callback to be invoked when the app banner flow finishes.
+  void PrepareDone(base::OnceClosure on_done);
+
+  // Returns the internal state of the AppBannerManager.
+  AppBannerManager::State state();
+
+  // Block until the current app has been installed.
+  void AwaitAppInstall();
+
   // AppBannerManager:
   void OnDidGetManifest(const InstallableData& result) override;
   void OnDidPerformInstallableWebAppCheck(
       const InstallableData& result) override;
   void ResetCurrentPageData() override;
 
+ protected:
+  // AppBannerManager:
+  void OnInstall(blink::mojom::DisplayMode display) override;
+  void DidFinishCreatingWebApp(const web_app::AppId& app_id,
+                               web_app::InstallResultCode code) override;
+  void UpdateState(AppBannerManager::State state) override;
+
  private:
   void SetInstallable(bool installable);
+  void OnFinished();
 
   base::Optional<bool> installable_;
   base::OnceClosure tear_down_quit_closure_;
   base::OnceClosure installable_quit_closure_;
+  base::OnceClosure on_done_;
+  base::OnceClosure on_install_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppBannerManagerDesktop);
 };