[Extensions] Disable some Management test for SW-based extensions.

The SelfUninstall and SelfUninstallNoPermissions test are flaky when
run by a SW-based extension. This CL moves them to the base class,
so they are only run as legacy extensions.

Bug: 1132581
Change-Id: Iec1fce201f58d833b7d9b124e658d0ae0219db1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446836Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814464}

chrome/browser/extensions/api/management/management_api_browsertest.cc

@@ -87,8 +87,7 @@ INSTANTIATE_TEST_SUITE_P(PersistentBackground,
                          ExtensionManagementApiTestWithBackgroundType,
                          ::testing::Values(ContextType::kPersistentBackground));
 
-// Disabled due to timeouts; see https://crbug.com/1132581.
-INSTANTIATE_TEST_SUITE_P(DISABLED_ServiceWorker,
+INSTANTIATE_TEST_SUITE_P(ServiceWorker,
                          ExtensionManagementApiTestWithBackgroundType,
                          ::testing::Values(ContextType::kServiceWorker));
 
@@ -177,22 +176,29 @@ IN_PROC_BROWSER_TEST_P(ExtensionManagementApiTestWithBackgroundType,
   ASSERT_TRUE(listener1.WaitUntilSatisfied());
 }
 
-IN_PROC_BROWSER_TEST_P(ExtensionManagementApiTestWithBackgroundType,
-                       SelfUninstall) {
+// TODO(https://crbug.com/1132581): This uninstall test is flaky for Service
+// Worker-based extensions. This should be an
+// ExtensionManagementApiTestWithBackgroundType test once that issue is
+// resolved.
+IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, SelfUninstall) {
   ExtensionTestMessageListener listener1("success", false);
-  ASSERT_TRUE(LoadExtensionWithParamFlags(
+  ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("management/self_uninstall_helper")));
-  ASSERT_TRUE(LoadExtensionWithParamFlags(
-      test_data_dir_.AppendASCII("management/self_uninstall")));
+  ASSERT_TRUE(
+      LoadExtension(test_data_dir_.AppendASCII("management/self_uninstall")));
   ASSERT_TRUE(listener1.WaitUntilSatisfied());
 }
 
-IN_PROC_BROWSER_TEST_P(ExtensionManagementApiTestWithBackgroundType,
+// TODO(https://crbug.com/1132581): This uninstall test is flaky for Service
+// Worker-based extensions. This should be an
+// ExtensionManagementApiTestWithBackgroundType test once that issue is
+// resolved.
+IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
                        SelfUninstallNoPermissions) {
   ExtensionTestMessageListener listener1("success", false);
-  ASSERT_TRUE(LoadExtensionWithParamFlags(
+  ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("management/self_uninstall_helper")));
-  ASSERT_TRUE(LoadExtensionWithParamFlags(
+  ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("management/self_uninstall_noperm")));
   ASSERT_TRUE(listener1.WaitUntilSatisfied());
 }