Revert of Simplify ExtensionInstallChecker into a single-use class

chrome/browser/extensions/unpacked_installer.cc

 // Copyright (c) 2013 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/extensions/unpacked_installer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
-#include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "components/crx_file/id_util.h"
 #include "components/sync/model/string_ordinal.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 80 matching lines @@
 // static
 scoped_refptr<UnpackedInstaller> UnpackedInstaller::Create(
     ExtensionService* extension_service) {
   DCHECK(extension_service);
   return scoped_refptr<UnpackedInstaller>(
       new UnpackedInstaller(extension_service));
 }
 
 UnpackedInstaller::UnpackedInstaller(ExtensionService* extension_service)
     : service_weak_(extension_service->AsWeakPtr()),
-      profile_(extension_service->profile()),
       prompt_for_plugins_(true),
       require_modern_manifest_version_(true),
-      be_noisy_on_failure_(true) {
+      be_noisy_on_failure_(true),
+      install_checker_(extension_service->profile()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 UnpackedInstaller::~UnpackedInstaller() {
 }
 
 void UnpackedInstaller::Load(const base::FilePath& path_in) {
   DCHECK(extension_path_.empty());
   extension_path_ = path_in;
   BrowserThread::PostTask(
@@ skipping 15 matching lines @@
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   extension_path_ = base::MakeAbsoluteFilePath(path_in);
 
   if (!IsLoadingUnpackedAllowed()) {
     ReportExtensionLoadError(kUnpackedExtensionsBlacklistedError);
     return false;
   }
 
   std::string error;
-  extension_ = file_util::LoadExtension(extension_path_, Manifest::COMMAND_LINE,
-                                        GetFlags(), &error);
+  install_checker_.set_extension(
+      file_util::LoadExtension(
+          extension_path_, Manifest::COMMAND_LINE, GetFlags(), &error).get());
 
   if (!extension() ||
       !extension_l10n_util::ValidateExtensionLocales(
           extension_path_, extension()->manifest()->value(), &error)) {
     ReportExtensionLoadError(error);
     return false;
   }
 
   if (only_allow_apps && !extension()->is_platform_app()) {
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 23 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!service_weak_.get())
     return;
 
   const ExtensionSet& disabled_extensions =
       ExtensionRegistry::Get(service_weak_->profile())->disabled_extensions();
   if (prompt_for_plugins_ &&
       PluginInfo::HasPlugins(extension()) &&
       !disabled_extensions.Contains(extension()->id())) {
     SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
-        extension(), profile_,
+        extension(),
+        install_checker_.profile(),
         base::Bind(&UnpackedInstaller::StartInstallChecks, this));
     prompt->ShowPrompt();
     return;
   }
   StartInstallChecks();
 }
 
 void UnpackedInstaller::StartInstallChecks() {
   // TODO(crbug.com/421128): Enable these checks all the time.  The reason
   // they are disabled for extensions loaded from the command-line is that
@@ skipping 24 matching lines @@
         } else if (imported_module && (version_required.IsValid() &&
                                        imported_module->version()->CompareTo(
                                            version_required) < 0)) {
           ReportExtensionLoadError(kImportMinVersionNewer);
           return;
         }
       }
     }
   }
 
-  install_checker_ = base::MakeUnique<ExtensionInstallChecker>(
-      profile_, extension_,
+  install_checker_.Start(
       ExtensionInstallChecker::CHECK_REQUIREMENTS |
           ExtensionInstallChecker::CHECK_MANAGEMENT_POLICY,
-      true /* fail fast */);
-  install_checker_->Start(
+      true /* fail fast */,
       base::Bind(&UnpackedInstaller::OnInstallChecksComplete, this));
 }
 
 void UnpackedInstaller::OnInstallChecksComplete(int failed_checks) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (!install_checker_->policy_error().empty()) {
-    ReportExtensionLoadError(install_checker_->policy_error());
+  if (!install_checker_.policy_error().empty()) {
+    ReportExtensionLoadError(install_checker_.policy_error());
     return;
   }
 
-  if (!install_checker_->requirement_errors().empty()) {
+  if (!install_checker_.requirement_errors().empty()) {
     ReportExtensionLoadError(
-        base::JoinString(install_checker_->requirement_errors(), " "));
+        base::JoinString(install_checker_.requirement_errors(), " "));
     return;
   }
 
   InstallExtension();
 }
 
 int UnpackedInstaller::GetFlags() {
   std::string id = crx_file::id_util::GenerateIdForPath(extension_path_);
   bool allow_file_access =
       Manifest::ShouldAlwaysAllowFileAccess(Manifest::UNPACKED);
@@ skipping 50 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&UnpackedInstaller::LoadWithFileAccess, this, GetFlags()));
 }
 
 void UnpackedInstaller::LoadWithFileAccess(int flags) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   std::string error;
-  extension_ = file_util::LoadExtension(extension_path_, Manifest::UNPACKED,
-                                        flags, &error);
+  install_checker_.set_extension(
+      file_util::LoadExtension(
+          extension_path_, Manifest::UNPACKED, flags, &error).get());
 
   if (!extension() ||
       !extension_l10n_util::ValidateExtensionLocales(
           extension_path_, extension()->manifest()->value(), &error)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&UnpackedInstaller::ReportExtensionLoadError, this, error));
     return;
   }
@@ skipping 36 matching lines @@
   service_weak_->OnExtensionInstalled(
       extension(), syncer::StringOrdinal(), kInstallFlagInstallImmediately);
 
   if (!callback_.is_null()) {
     callback_.Run(extension(), extension_path_, std::string());
     callback_.Reset();
   }
 }
 
 }  // namespace extensions