Simplify ExtensionInstallChecker into a single-use class

chrome/browser/extensions/crx_installer.h

Index: chrome/browser/extensions/crx_installer.h
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 7d7168faefe45e2403f4c5cce3abac9cdadadd6f..e16d57cce649cf0ba724140a37bb07512d56e4e6 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -14,7 +15,6 @@
 #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"
@@ -36,6 +36,7 @@ class SequencedTaskRunner;
 
 namespace extensions {
 class CrxInstallError;
+class ExtensionInstallChecker;
 class ExtensionUpdaterTest;
 
 // This class installs a crx file into a profile.
@@ -200,9 +201,9 @@ class CrxInstaller : public SandboxedUnpackerClient {
 
   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.
@@ -211,7 +212,6 @@ class CrxInstaller : public SandboxedUnpackerClient {
  private:
   friend class ::ExtensionServiceTest;
   friend class ExtensionUpdaterTest;
-  friend class ExtensionCrxInstallerTest;
 
   CrxInstaller(base::WeakPtr<ExtensionService> service_weak,
                std::unique_ptr<ExtensionInstallPrompt> client,
@@ -288,6 +288,12 @@ class CrxInstaller : public SandboxedUnpackerClient {
       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_;
 
@@ -438,7 +444,7 @@ class CrxInstaller : public SandboxedUnpackerClient {
   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);
 };