Revert of Fix content verifier problem with content scripts

extensions/browser/content_verify_job.cc

 // Copyright 2014 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.
 
 #include "extensions/browser/content_verify_job.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
@@ skipping 114 matching lines @@
     return;
   if (g_test_delegate) {
     FailureReason reason =
         g_test_delegate->DoneReading(hash_reader_->extension_id());
     if (reason != NONE) {
       DispatchFailureCallback(reason);
       return;
     }
   }
   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() {
   if (current_hash_byte_count_ <= 0)
     return true;
   std::string final(crypto::kSHA256Length, 0);
   current_hash_->Finish(string_as_array(&final), final.size());
   current_hash_.reset();
   current_hash_byte_count_ = 0;
 
@@ skipping 24 matching lines @@
   hashes_ready_ = true;
   if (!queue_.empty()) {
     std::string tmp;
     queue_.swap(tmp);
     BytesRead(tmp.size(), string_as_array(&tmp));
   }
   if (done_reading_) {
     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_);
-    }
   }
 }
 
 // static
 void ContentVerifyJob::SetDelegateForTests(TestDelegate* delegate) {
   g_test_delegate = delegate;
 }
 
 // static
 void ContentVerifyJob::SetObserverForTests(TestObserver* observer) {
   g_test_observer = observer;
 }
 
 void ContentVerifyJob::DispatchFailureCallback(FailureReason reason) {
   DCHECK(!failed_);
   failed_ = true;
   if (!failure_callback_.is_null()) {
     VLOG(1) << "job failed for " << hash_reader_->extension_id() << " "
             << hash_reader_->relative_path().MaybeAsASCII()
             << " reason:" << reason;
     failure_callback_.Run(reason);
     failure_callback_.Reset();
   }
   if (g_test_observer)
     g_test_observer->JobFinished(
         hash_reader_->extension_id(), hash_reader_->relative_path(), failed_);
 }
 
 }  // namespace extensions