Update the CrxInstaller and UnpackedInstaller to use the ExtensionInstallChecker

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 <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/blacklist.h"
+#include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
-#include "chrome/browser/extensions/extension_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/install_flag.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "sync/api/string_ordinal.h"
 
 class ExtensionService;
@@ skipping 159 matching lines @@
   }
   void set_is_ephemeral(bool val) {
     set_install_flag(kInstallFlagIsEphemeral, 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 installer_.profile(); }
+  Profile* profile() { return install_checker_.profile(); }
 
-  const Extension* extension() { return installer_.extension().get(); }
+  const Extension* extension() { return install_checker_.extension().get(); }
 
   const std::string& current_version() const { return current_version_; }
 
  private:
   friend class ::ExtensionServiceTest;
   friend class ExtensionUpdaterTest;
   friend class ExtensionCrxInstallerTest;
 
   CrxInstaller(base::WeakPtr<ExtensionService> service_weak,
                scoped_ptr<ExtensionInstallPrompt> client,
@@ skipping 11 matching lines @@
   CrxInstallerError AllowInstall(const Extension* extension);
 
   // SandboxedUnpackerClient
   virtual void OnUnpackFailure(const base::string16& error_message) OVERRIDE;
   virtual void OnUnpackSuccess(const base::FilePath& temp_dir,
                                const base::FilePath& extension_dir,
                                const base::DictionaryValue* original_manifest,
                                const Extension* extension,
                                const SkBitmap& install_icon) OVERRIDE;
 
-  // Called on the UI thread to start the requirements check on the extension.
-  void CheckImportsAndRequirements();
+  // Called on the UI thread to start the requirements, policy and blacklist
+  // checks on the extension.
+  void CheckInstall();
 
-  // Runs on the UI thread. Callback from RequirementsChecker.
-  void OnRequirementsChecked(std::vector<std::string> requirement_errors);
+  // Runs on the UI thread. Callback from ExtensionInstallChecker.
+  void OnInstallChecksComplete(int failed_checks);
 
   // Runs on the UI thread. Callback from Blacklist.
   void OnBlacklistChecked(
       extensions::BlacklistState blacklist_state);
 
   // Runs on the UI thread. Confirms the installation to the ExtensionService.
   void ConfirmInstall();
 
   // Runs on File thread. Install the unpacked extension into the profile and
   // notify the frontend.
@@ skipping 163 matching lines @@
   // Used to show the install dialog.
   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_;
 
-  // Gives access to common methods and data of an extension installer.
-  ExtensionInstaller installer_;
+  // Performs requirements, policy and blacklist checks on the extension.
+  ExtensionInstallChecker install_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_