[Extensions WebUI] Clean up ExtensionSettingsUIBrowserTest

chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
index bc3bbab079f34789073a62cc5582c49aa971bb74..ac235af96c8d518b9878a8d8aaebea414e089b93 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc
@@ -4,42 +4,22 @@
 
 #include "chrome/browser/ui/webui/extensions/extension_settings_browsertest.h"
 
-#include <stddef.h>
-#include <utility>
-
-#include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/strings/string_number_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/crx_installer.h"
-#include "chrome/browser/extensions/extension_error_reporter.h"
-#include "chrome/browser/extensions/extension_install_prompt.h"
-#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
-#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/chrome_test_extension_loader.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/test_utils.h"
-#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_dialog_auto_confirm.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/test_extension_registry_observer.h"
-#include "extensions/common/extension_set.h"
 
 using extensions::Extension;
 using extensions::TestManagementPolicyProvider;
 
 ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest()
-    : profile_(nullptr),
-      policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS |
+    : policy_provider_(TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS |
                        TestManagementPolicyProvider::MUST_REMAIN_ENABLED |
                        TestManagementPolicyProvider::MUST_REMAIN_INSTALLED) {
   CHECK(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
@@ -48,57 +28,40 @@ ExtensionSettingsUIBrowserTest::ExtensionSettingsUIBrowserTest()
 
 ExtensionSettingsUIBrowserTest::~ExtensionSettingsUIBrowserTest() {}
 
-Profile* ExtensionSettingsUIBrowserTest::GetProfile() {
-  if (!profile_) {
-    profile_ = browser() ? browser()->profile() :
-                           ProfileManager::GetActiveUserProfile();
-  }
-  return profile_;
-}
-
-void ExtensionSettingsUIBrowserTest::SetUpOnMainThread() {
-  WebUIBrowserTest::SetUpOnMainThread();
-  observer_.reset(
-      new extensions::ChromeExtensionTestNotificationObserver(browser()));
-}
-
 void ExtensionSettingsUIBrowserTest::InstallGoodExtension() {
   EXPECT_TRUE(InstallExtension(test_data_dir_.AppendASCII("good.crx")));
 }
 
 void ExtensionSettingsUIBrowserTest::InstallErrorsExtension() {
-  EXPECT_TRUE(InstallUnpackedExtension(
-      test_data_dir_.AppendASCII("error_console")
-                    .AppendASCII("runtime_and_manifest_errors")));
+  EXPECT_TRUE(
+      InstallExtension(test_data_dir_.AppendASCII("error_console")
+                           .AppendASCII("runtime_and_manifest_errors")));
 }
 
 void ExtensionSettingsUIBrowserTest::InstallSharedModule() {
   base::FilePath shared_module_path =
       test_data_dir_.AppendASCII("api_test").AppendASCII("shared_module");
-  EXPECT_TRUE(InstallUnpackedExtension(
-      shared_module_path.AppendASCII("shared")));
-  EXPECT_TRUE(InstallUnpackedExtension(
-      shared_module_path.AppendASCII("import_pass")));
+  EXPECT_TRUE(InstallExtension(shared_module_path.AppendASCII("shared")));
+  EXPECT_TRUE(InstallExtension(shared_module_path.AppendASCII("import_pass")));
 }
 
 void ExtensionSettingsUIBrowserTest::InstallPackagedApp() {
-  EXPECT_TRUE(InstallUnpackedExtension(
-      test_data_dir_.AppendASCII("packaged_app")));
+  EXPECT_TRUE(InstallExtension(test_data_dir_.AppendASCII("packaged_app")));
 }
 
 void ExtensionSettingsUIBrowserTest::InstallHostedApp() {
-  EXPECT_TRUE(InstallUnpackedExtension(
-      test_data_dir_.AppendASCII("hosted_app")));
+  EXPECT_TRUE(InstallExtension(test_data_dir_.AppendASCII("hosted_app")));
 }
 
 void ExtensionSettingsUIBrowserTest::InstallPlatformApp() {
-  EXPECT_TRUE(InstallUnpackedExtension(
+  EXPECT_TRUE(InstallExtension(
       test_data_dir_.AppendASCII("platform_apps").AppendASCII("minimal")));
 }
 
 void ExtensionSettingsUIBrowserTest::AddManagedPolicyProvider() {
-  auto* extension_service = extensions::ExtensionSystem::Get(GetProfile());
-  extension_service->management_policy()->RegisterProvider(&policy_provider_);
+  extensions::ExtensionSystem* extension_system =
+      extensions::ExtensionSystem::Get(browser()->profile());
+  extension_system->management_policy()->RegisterProvider(&policy_provider_);
 }
 
 void ExtensionSettingsUIBrowserTest::SetAutoConfirmUninstall() {
@@ -118,88 +81,9 @@ void ExtensionSettingsUIBrowserTest::ShrinkWebContentsView() {
   ResizeWebContents(web_contents, gfx::Rect(0, 0, 400, 400));
 }
 
-const Extension* ExtensionSettingsUIBrowserTest::InstallUnpackedExtension(
-    const base::FilePath& path) {
-  if (path.empty())
-    return nullptr;
-
-  Profile* profile = GetProfile();
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile)->extension_service();
-  service->set_show_extensions_prompts(false);
-  extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(profile);
-  extensions::TestExtensionRegistryObserver observer(registry);
-  extensions::UnpackedInstaller::Create(service)->Load(path);
-  base::FilePath extension_path = base::MakeAbsoluteFilePath(path);
-  const Extension* extension = nullptr;
-  do {
-    extension = observer.WaitForExtensionLoaded();
-  } while (extension->path() != extension_path);
-
-  return extension;
-}
-
 const Extension* ExtensionSettingsUIBrowserTest::InstallExtension(
     const base::FilePath& path) {
-  Profile* profile = GetProfile();
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile)->extension_service();
-  extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(profile);
-  service->set_show_extensions_prompts(false);
-  size_t num_before = registry->enabled_extensions().size();
-  {
-    extensions::ScopedTestDialogAutoConfirm auto_confirm(
-        extensions::ScopedTestDialogAutoConfirm::ACCEPT);
-    std::unique_ptr<ExtensionInstallPrompt> install_ui(
-        new ExtensionInstallPrompt(
-            browser()->tab_strip_model()->GetActiveWebContents()));
-
-    base::FilePath crx_path = path;
-    DCHECK(crx_path.Extension() == FILE_PATH_LITERAL(".crx"));
-    if (crx_path.empty())
-      return nullptr;
-
-    scoped_refptr<extensions::CrxInstaller> installer(
-        extensions::CrxInstaller::Create(service, std::move(install_ui)));
-    installer->set_expected_id(std::string());
-    installer->set_is_gallery_install(false);
-    installer->set_install_source(extensions::Manifest::INTERNAL);
-    installer->set_install_immediately(true);
-    installer->set_off_store_install_allow_reason(
-        extensions::CrxInstaller::OffStoreInstallAllowedInTest);
-
-    observer_->Watch(
-        extensions::NOTIFICATION_CRX_INSTALLER_DONE,
-        content::Source<extensions::CrxInstaller>(installer.get()));
-
-    installer->InstallCrx(crx_path);
-
-    observer_->Wait();
-  }
-
-  size_t num_after = registry->enabled_extensions().size();
-  if (num_before + 1 != num_after) {
-    VLOG(1) << "Num extensions before: " << base::SizeTToString(num_before)
-            << " num after: " << base::SizeTToString(num_after)
-            << " Installed extensions follow:";
-
-    for (const scoped_refptr<const Extension>& extension :
-         registry->enabled_extensions())
-      VLOG(1) << "  " << extension->id();
-
-    VLOG(1) << "Errors follow:";
-    const std::vector<base::string16>* errors =
-        ExtensionErrorReporter::GetInstance()->GetErrors();
-    for (std::vector<base::string16>::const_iterator iter = errors->begin();
-         iter != errors->end(); ++iter)
-      VLOG(1) << *iter;
-
-    return nullptr;
-  }
-
-  if (!observer_->WaitForExtensionViewsToLoad())
-    return nullptr;
-  return service->GetExtensionById(last_loaded_extension_id(), false);
+  extensions::ChromeTestExtensionLoader loader(browser()->profile());
+  loader.set_ignore_manifest_warnings(true);
+  return loader.LoadExtension(path).get();
 }