Replace ExtensionInstallChecker with generic PreloadCheckGroup

extensions/browser/preload_check_test_util.cc

Index: extensions/browser/preload_check_test_util.cc
diff --git a/extensions/browser/preload_check_test_util.cc b/extensions/browser/preload_check_test_util.cc
index f5becf43ae4a7173c854c744f33c495fd2992565..482236fbed4e03526fdc3f87a298756c94edd676 100644
--- a/extensions/browser/preload_check_test_util.cc
+++ b/extensions/browser/preload_check_test_util.cc
@@ -20,14 +20,6 @@ namespace extensions {
 PreloadCheckRunner::PreloadCheckRunner() : called_(false) {}
 PreloadCheckRunner::~PreloadCheckRunner() {}
 
-void PreloadCheckRunner::OnCheckComplete(PreloadCheck::Errors errors) {
-  ASSERT_FALSE(called_);
-  called_ = true;
-  errors_ = errors;
-  if (run_loop_)
-    run_loop_->Quit();
-}
-
 void PreloadCheckRunner::Run(PreloadCheck* check) {
   check->Start(GetCallback());
 }
@@ -36,9 +28,18 @@ void PreloadCheckRunner::RunUntilComplete(PreloadCheck* check) {
   Run(check);
   ASSERT_FALSE(called_);
 
+  WaitForComplete();
+  ASSERT_TRUE(called_);
+}
+
+void PreloadCheckRunner::WaitForComplete() {
   run_loop_ = base::MakeUnique<base::RunLoop>();
   run_loop_->Run();
-  ASSERT_TRUE(called_);
+}
+
+void PreloadCheckRunner::WaitForIdle() {
+  run_loop_ = base::MakeUnique<base::RunLoop>();
+  run_loop_->RunUntilIdle();
 }
 
 PreloadCheck::ResultCallback PreloadCheckRunner::GetCallback() {
@@ -46,23 +47,24 @@ PreloadCheck::ResultCallback PreloadCheckRunner::GetCallback() {
                     base::Unretained(this));
 }
 
-void PreloadCheckRunner::WaitForIdle() {
-  run_loop_ = base::MakeUnique<base::RunLoop>();
-  run_loop_->RunUntilIdle();
+void PreloadCheckRunner::OnCheckComplete(PreloadCheck::Errors errors) {
+  ASSERT_FALSE(called_);
+  called_ = true;
+  errors_ = errors;
+
+  if (run_loop_)
+    run_loop_->Quit();
 }
 
 // PreloadCheckStub:
-PreloadCheckStub::PreloadCheckStub()
-    : PreloadCheck(nullptr), is_async_(false), weak_ptr_factory_(this) {}
+PreloadCheckStub::PreloadCheckStub(const Errors& errors)
+    : PreloadCheck(nullptr), errors_(errors), weak_ptr_factory_(this) {}
 
 PreloadCheckStub::~PreloadCheckStub() {}
 
-void PreloadCheckStub::AddError(Error error) {
-  errors_.insert(error);
-}
-
 void PreloadCheckStub::Start(ResultCallback callback) {
   DCHECK(!callback.is_null());
+  started_ = true;
   if (is_async_) {
     // TODO(michaelpg): Bind the callback directly and remove RunCallback
     // once crbug.com/704027 is addressed.
@@ -79,8 +81,4 @@ void PreloadCheckStub::RunCallback(ResultCallback callback) {
   std::move(callback).Run(errors_);
 }
 
-base::string16 PreloadCheckStub::GetErrorMessage() const {
-  return message_;
-}
-
 }  // namespace extensions