Update the CrxInstaller and UnpackedInstaller to use the ExtensionInstallChecker

chrome/browser/extensions/unpacked_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_UNPACKED_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_UNPACKED_INSTALLER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/extensions/extension_installer.h"
+#include "chrome/browser/extensions/extension_install_checker.h"
 
 class ExtensionService;
 
 namespace extensions {
 
 class Extension;
-class RequirementsChecker;
 
 // Installs and loads an unpacked extension. Because internal state needs to be
 // held about the instalation process, only one call to Load*() should be made
 // per UnpackedInstaller.
 // TODO(erikkay): It might be useful to be able to load a packed extension
 // (presumably into memory) without installing it.
 class UnpackedInstaller
     : public base::RefCountedThreadSafe<UnpackedInstaller> {
  public:
   typedef base::Callback<void(const base::FilePath&, const std::string&)>
@@ skipping 41 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<UnpackedInstaller>;
 
   explicit UnpackedInstaller(ExtensionService* extension_service);
   virtual ~UnpackedInstaller();
 
   // Must be called from the UI thread.
   void ShowInstallPrompt();
 
-  // Calls CheckRequirements.
-  void CallCheckRequirements();
+  // Begin management policy and requirements checks.
+  void StartInstallChecks();
 
-  // Callback from RequirementsChecker.
-  void OnRequirementsChecked(std::vector<std::string> requirement_errors);
+  // Callback from ExtensionInstallChecker.
+  void OnInstallChecksComplete(int failed_checks);
 
   // Verifies if loading unpacked extensions is allowed.
   bool IsLoadingUnpackedAllowed() const;
 
   // We change the input extension path to an absolute path, on the file thread.
   // Then we need to check the file access preference, which needs
   // to happen back on the UI thread, so it posts CheckExtensionFileAccess on
   // the UI thread. In turn, once that gets the pref, it goes back to the
   // file thread with LoadWithFileAccess.
   // TODO(yoz): It would be nice to remove this ping-pong, but we need to know
   // what file access flags to pass to file_util::LoadExtension.
   void GetAbsolutePath();
   void CheckExtensionFileAccess();
   void LoadWithFileAccess(int flags);
 
   // Notify the frontend that an attempt to retry will not be necessary.
   void UnregisterLoadRetryListener();
 
   // Notify the frontend that there was an error loading an extension.
   void ReportExtensionLoadError(const std::string& error);
 
-  // Called when an unpacked extension has been loaded and installed.
-  void ConfirmInstall();
+  // Passes the extension onto extension service.
+  void InstallExtension();
 
   // Helper to get the Extension::CreateFlags for the installing extension.
   int GetFlags();
 
+  const Extension* extension() { return install_checker_.extension().get(); }
+
   // The service we will report results back to.
   base::WeakPtr<ExtensionService> service_weak_;
 
   // The pathname of the directory to load from, which is an absolute path
   // after GetAbsolutePath has been called.
   base::FilePath extension_path_;
 
   // If true and the extension contains plugins, we prompt the user before
   // loading.
   bool prompt_for_plugins_;
 
   // Whether to require the extension installed to have a modern manifest
   // version.
   bool require_modern_manifest_version_;
 
   // An optional callback to set in order to be notified of failure.
   OnFailureCallback on_failure_callback_;
 
   // Whether or not to be noisy (show a dialog) on failure. Defaults to true.
   bool be_noisy_on_failure_;
 
-  // Gives access to common methods and data of an extension installer.
-  ExtensionInstaller installer_;
+  // Checks management policies and requirements before the extension can be
+  // installed.
+  ExtensionInstallChecker install_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(UnpackedInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UNPACKED_INSTALLER_H_