Simplify ExtensionInstallChecker into a single-use class

chrome/browser/extensions/crx_installer.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
-#include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/sync/model/string_ordinal.h"
 #include "extensions/browser/install_flag.h"
 #include "extensions/browser/sandboxed_unpacker.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionService;
 class ExtensionServiceTest;
 class SkBitmap;
 struct WebApplicationInfo;
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace extensions {
 class CrxInstallError;
+class ExtensionInstallChecker;
 class ExtensionUpdaterTest;
 
 // This class installs a crx file into a profile.
 //
 // Installing a CRX is a multi-step process, including unpacking the crx,
 // validating it, prompting the user, and installing. Since many of these
 // steps must occur on the file thread, this class contains a copy of all data
 // necessary to do its job. (This also minimizes external dependencies for
 // easier testing).
 //
@@ skipping 144 matching lines @@
 
   void set_install_immediately(bool val) {
     set_install_flag(kInstallFlagInstallImmediately, val);
   }
   void set_do_not_sync(bool val) {
     set_install_flag(kInstallFlagDoNotSync, val);
   }
 
   bool did_handle_successfully() const { return did_handle_successfully_; }
 
-  Profile* profile() { return install_checker_.profile(); }
+  Profile* profile() { return profile_; }
 
-  const Extension* extension() { return install_checker_.extension().get(); }
+  const Extension* extension() { return extension_.get(); }
 
   // The currently installed version of the extension, for updates. Will be
   // invalid if this isn't an update.
   const base::Version& current_version() const { return current_version_; }
 
  private:
   friend class ::ExtensionServiceTest;
   friend class ExtensionUpdaterTest;
-  friend class ExtensionCrxInstallerTest;
 
   CrxInstaller(base::WeakPtr<ExtensionService> service_weak,
                std::unique_ptr<ExtensionInstallPrompt> client,
                const WebstoreInstaller::Approval* approval);
   ~CrxInstaller() override;
 
   // Converts the source user script to an extension.
   void ConvertUserScriptOnFileThread();
 
   // Converts the source web app to an extension.
@@ skipping 56 matching lines @@
   // and needs additional permissions.
   void ConfirmReEnable();
 
   void set_install_flag(int flag, bool val) {
     if (val)
       install_flags_ |= flag;
     else
       install_flags_ &= ~flag;
   }
 
+  // The Profile the extension is being installed in.
+  Profile* profile_;
+
+  // The extension being installed.
+  scoped_refptr<const Extension> extension_;
+
   // The file we're installing.
   base::FilePath source_file_;
 
   // The URL the file was downloaded from.
   GURL download_url_;
 
   // The directory extensions are installed to.
   const base::FilePath install_directory_;
 
   // The location the installation came from (bundled with Chromium, registry,
@@ skipping 130 matching lines @@
   ExtensionInstallPrompt::ShowDialogCallback show_dialog_callback_;
 
   // Whether the update is initiated by the user from the extension settings
   // page.
   bool update_from_settings_page_;
 
   // The flags for ExtensionService::OnExtensionInstalled.
   int install_flags_;
 
   // Performs requirements, policy and blacklist checks on the extension.
-  ExtensionInstallChecker install_checker_;
+  std::unique_ptr<ExtensionInstallChecker> install_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_