Revert of Fix content verifier problem with content scripts

extensions/browser/content_verify_job.cc

Index: extensions/browser/content_verify_job.cc
diff --git a/extensions/browser/content_verify_job.cc b/extensions/browser/content_verify_job.cc
index efd763eaf7294e48e7b7fd59267a2405d5ae7137..651dcae47b62ddd974d73527a253426996de5db3 100644
--- a/extensions/browser/content_verify_job.cc
+++ b/extensions/browser/content_verify_job.cc
@@ -132,13 +132,12 @@
     }
   }
   done_reading_ = true;
-  if (hashes_ready_) {
-    if (!FinishBlock())
-      DispatchFailureCallback(HASH_MISMATCH);
-    else if (g_test_observer)
-      g_test_observer->JobFinished(hash_reader_->extension_id(),
-                                   hash_reader_->relative_path(), failed_);
-  }
+  if (hashes_ready_ && !FinishBlock())
+    DispatchFailureCallback(HASH_MISMATCH);
+
+  if (!failed_ && g_test_observer)
+    g_test_observer->JobFinished(
+        hash_reader_->extension_id(), hash_reader_->relative_path(), failed_);
 }
 
 bool ContentVerifyJob::FinishBlock() {
@@ -183,10 +182,6 @@
     ScopedElapsedTimer timer(&time_spent_);
     if (!FinishBlock())
       DispatchFailureCallback(HASH_MISMATCH);
-    else if (g_test_observer) {
-      g_test_observer->JobFinished(hash_reader_->extension_id(),
-                                   hash_reader_->relative_path(), failed_);
-    }
   }
 }