Use PreloadCheckGroup in ExtensionInstallChecker. Make RequirementsChecker a PreloadCheck.

chrome/browser/extensions/requirements_checker_browsertest.cc

Index: chrome/browser/extensions/requirements_checker_browsertest.cc
diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc
index 12b8491f806abef35e280f2c51d747f619e928d6..ece796a3898c354665f364c704fdb5ad899e7fd3 100644
--- a/chrome/browser/extensions/requirements_checker_browsertest.cc
+++ b/chrome/browser/extensions/requirements_checker_browsertest.cc
@@ -6,12 +6,13 @@
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/extensions/chrome_requirements_checker.h"
+#include "extensions/browser/requirements_checker.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/generated_resources.h"
@@ -25,10 +26,10 @@
 
 namespace extensions {
 
+// TODO(michaelpg): Move test to //extensions.
 class RequirementsCheckerBrowserTest : public ExtensionBrowserTest {
  public:
-  RequirementsCheckerBrowserTest()
-      : checker_(new ChromeRequirementsChecker()) {}
+  RequirementsCheckerBrowserTest() {}
 
   scoped_refptr<const Extension> LoadExtensionFromDirName(
       const std::string& extension_dir_name) {
@@ -44,8 +45,8 @@ class RequirementsCheckerBrowserTest : public ExtensionBrowserTest {
   }
 
   void ValidateRequirementErrors(
-      const std::vector<std::string>& expected_errors,
-      const std::vector<std::string>& actual_errors) {
+      PreloadCheck::Errors expected_errors,
+      PreloadCheck::Errors actual_errors) {
     ASSERT_EQ(expected_errors, actual_errors);
   }
 
@@ -83,9 +84,11 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, CheckEmptyExtension) {
   scoped_refptr<const Extension> extension(
       LoadExtensionFromDirName("no_requirements"));
   ASSERT_TRUE(extension.get());
-  checker_->Check(extension, base::Bind(
+
+  checker_ = base::MakeUnique<RequirementsChecker>(extension.get());
+  checker_->Start(base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
-      base::Unretained(this), std::vector<std::string>()));
+      base::Unretained(this), PreloadCheck::Errors()));
   content::RunAllBlockingPoolTasksUntilIdle();
 }
 
@@ -94,13 +97,13 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, CheckNpapiExtension) {
       LoadExtensionFromDirName("require_npapi"));
   ASSERT_TRUE(extension.get());
 
-  std::vector<std::string> expected_errors;
+  PreloadCheck::Errors expected_errors;
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-  expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_NPAPI_NOT_SUPPORTED));
+  expected_errors.insert(PreloadCheck::NPAPI_NOT_SUPPORTED);
 #endif
 
-  checker_->Check(extension, base::Bind(
+  checker_ = base::MakeUnique<RequirementsChecker>(extension.get());
+  checker_->Start(base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
       base::Unretained(this), expected_errors));
   content::RunAllBlockingPoolTasksUntilIdle();
@@ -112,13 +115,13 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest,
       LoadExtensionFromDirName("require_window_shape"));
   ASSERT_TRUE(extension.get());
 
-  std::vector<std::string> expected_errors;
+  PreloadCheck::Errors expected_errors;
 #if !defined(USE_AURA)
-  expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_WINDOW_SHAPE_NOT_SUPPORTED));
+  expected_errors.insert(PreloadCheck::WINDOW_SHAPE_NOT_SUPPORTED);
 #endif  // !defined(USE_AURA)
 
-  checker_->Check(extension, base::Bind(
+  checker_ = base::MakeUnique<RequirementsChecker>(extension.get());
+  checker_->Start(base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
       base::Unretained(this), expected_errors));
   content::RunAllBlockingPoolTasksUntilIdle();
@@ -135,11 +138,11 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, DisallowWebGL) {
   BlackListGPUFeatures(blacklisted_features);
   content::RunAllBlockingPoolTasksUntilIdle();
 
-  std::vector<std::string> expected_errors;
-  expected_errors.push_back(l10n_util::GetStringUTF8(
-      IDS_EXTENSION_WEBGL_NOT_SUPPORTED));
+  PreloadCheck::Errors expected_errors;
+  expected_errors.insert(PreloadCheck::WEBGL_NOT_SUPPORTED);
 
-  checker_->Check(extension, base::Bind(
+  checker_ = base::MakeUnique<RequirementsChecker>(extension.get());
+  checker_->Start(base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
       base::Unretained(this), expected_errors));
   content::RunAllBlockingPoolTasksUntilIdle();
@@ -150,14 +153,13 @@ IN_PROC_BROWSER_TEST_F(RequirementsCheckerBrowserTest, Check3DExtension) {
       LoadExtensionFromDirName("require_3d"));
   ASSERT_TRUE(extension.get());
 
-  std::vector<std::string> expected_errors;
+  PreloadCheck::Errors expected_errors;
 
-  if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL)) {
-    expected_errors.push_back(l10n_util::GetStringUTF8(
-        IDS_EXTENSION_WEBGL_NOT_SUPPORTED));
-  }
+  if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr))
+    expected_errors.insert(PreloadCheck::WEBGL_NOT_SUPPORTED);
 
-  checker_->Check(extension, base::Bind(
+  checker_ = base::MakeUnique<RequirementsChecker>(extension.get());
+  checker_->Start(base::Bind(
       &RequirementsCheckerBrowserTest::ValidateRequirementErrors,
       base::Unretained(this), expected_errors));
   content::RunAllBlockingPoolTasksUntilIdle();