Revert "desktop-pwas: browser controller shortcut support"

This reverts commit d66c160f.

Reason for revert: browser_tests failing on chromium.memory/win-asan

Bug: 1001408

Original change's description:
> desktop-pwas: browser controller shortcut support
> 
> WebAppBrowserController no longer causes a crash when
> shortcut apps are used.
> 
> Then BookmarkAppTest tests can now be run with
> WebAppBrowserController.
> 
> Bug: 966290
> Change-Id: I73793e080afc4a4392a23b36eef8ca2416a67b95
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787758
> Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
> Reviewed-by: Alan Cutter <alancutter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#694126}

TBR=ericwilligers@chromium.org,alancutter@chromium.org

Change-Id: I574f38b3894aa7dc8bdded511589fdd1b48d1723
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 966290
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787490Reviewed-by: Hitoshi Yoshida <peria@chromium.org>
Commit-Queue: Hitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694152}

chrome/browser/ui/web_applications/bookmark_app_browsertest.cc

@@ -9,9 +9,9 @@
 #include "base/test/bind_test_util.h"
 #include "base/test/metrics/histogram_tester.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
+#include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/web_applications/web_app_controller_browsertest.h"
 #include "chrome/browser/ui/web_applications/web_app_metrics.h"
 #include "chrome/browser/web_applications/components/pending_app_manager.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
@@ -134,7 +134,7 @@ void ExpectTotalCounts(const base::HistogramTester& tester,
 
 }  // namespace
 
-class BookmarkAppTest : public web_app::WebAppControllerBrowserTest {
+class BookmarkAppTest : public extensions::ExtensionBrowserTest {
  public:
   BookmarkAppTest() = default;
   ~BookmarkAppTest() override = default;
@@ -221,7 +221,7 @@ class BookmarkAppTest : public web_app::WebAppControllerBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(BookmarkAppTest);
 };
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramForAppInWindow) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramForAppInWindow) {
   base::HistogramTester tester;
 
   const GURL example_url = GURL("http://example.org/");
@@ -249,7 +249,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramForAppInWindow) {
   TestEngagementEventsAfterLaunch(histograms, app_browser);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramForAppInTab) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramForAppInTab) {
   base::HistogramTester tester;
 
   const GURL example_url = GURL("http://example.org/");
@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramForAppInTab) {
   TestEngagementEventsAfterLaunch(histograms, browser);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramAppWithoutScope) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramAppWithoutScope) {
   base::HistogramTester tester;
 
   const GURL example_url = GURL("http://example.org/");
@@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramAppWithoutScope) {
   TestEngagementEventsAfterLaunch(histograms, browser);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramTwoApps) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramTwoApps) {
   base::HistogramTester tester;
 
   const GURL example_url1 = GURL("http://example.org/");
@@ -354,7 +354,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramTwoApps) {
   ExpectTotalCounts(tester, ~histograms, 0);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramManyUserApps) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramManyUserApps) {
   base::HistogramTester tester;
 
   // More than 3 user-installed apps:
@@ -395,7 +395,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramManyUserApps) {
   ExpectTotalCounts(tester, ~histograms, 0);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramDefaultApp) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramDefaultApp) {
   base::HistogramTester tester;
 
   ASSERT_TRUE(embedded_test_server()->Start());
@@ -422,7 +422,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramDefaultApp) {
   TestEngagementEventsAfterLaunch(histograms, browser);
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest,
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest,
                        EngagementHistogramNavigateAwayFromAppTab) {
   const GURL app_url = GURL("http://example.org/app/");
   const GURL outer_url = GURL("http://example.org/");
@@ -456,7 +456,7 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest,
   }
 }
 
-IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramRecordedForNonApps) {
+IN_PROC_BROWSER_TEST_F(BookmarkAppTest, EngagementHistogramRecordedForNonApps) {
   base::HistogramTester tester;
   CountUserInstalledApps();
 
@@ -474,10 +474,3 @@ IN_PROC_BROWSER_TEST_P(BookmarkAppTest, EngagementHistogramRecordedForNonApps) {
   histograms[kHistogramNoUserInstalledApps] = true;
   TestEngagementEventsAfterLaunch(histograms, browser());
 }
-
-INSTANTIATE_TEST_SUITE_P(
-    /* no prefix */,
-    BookmarkAppTest,
-    ::testing::Values(
-        web_app::ControllerType::kHostedAppController,
-        web_app::ControllerType::kUnifiedControllerWithBookmarkApp));

chrome/browser/ui/web_applications/web_app_browser_controller.cc

@@ -29,8 +29,7 @@ base::Optional<AppId> WebAppBrowserController::GetAppId() const {
 }
 
 bool WebAppBrowserController::CreatedForInstalledPwa() const {
-  // TODO(crbug.com/915038): Implement and use WebApp::IsShortcut().
-  return registrar().GetAppScope(app_id_).has_value();
+  return true;
 }
 
 bool WebAppBrowserController::IsHostedApp() const {