Content Verification: Don't access UI-thread objects on the IO thread

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 119 matching lines @@
   done_reading_ = true;
   if (hashes_ready_ && !FinishBlock())
     DispatchFailureCallback(HASH_MISMATCH);
 }
 
 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;
+
+  int block = current_block_++;
 
   const std::string* expected_hash = NULL;
-  if (!hash_reader_->GetHashForBlock(current_block_, &expected_hash) ||
+  if (!hash_reader_->GetHashForBlock(block, &expected_hash) ||
       *expected_hash != final)
     return false;
 
-  current_hash_.reset();
-  current_hash_byte_count_ = 0;
-  current_block_++;
   return true;
 }
 
 void ContentVerifyJob::OnHashesReady(bool success) {
   if (!success && !g_test_delegate) {
     if (hash_reader_->have_verified_contents() &&
         hash_reader_->have_computed_hashes())
       DispatchFailureCallback(NO_HASHES_FOR_FILE);
     else
       DispatchFailureCallback(MISSING_ALL_HASHES);
@@ skipping 24 matching lines @@
   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();
   }
 }
 
 }  // namespace extensions