Fix several problems with the content verification code

extensions/browser/content_verify_job.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_CONTENT_VERIFY_JOB_H_
 #define EXTENSIONS_BROWSER_CONTENT_VERIFY_JOB_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 16 matching lines @@
 // Objects of this class are responsible for verifying that the actual content
 // read from an extension file matches an expected set of hashes. This class
 // can be created on any thread but the rest of the methods should be called
 // from only one thread.
 class ContentVerifyJob : public base::RefCountedThreadSafe<ContentVerifyJob> {
  public:
   enum FailureReason {
     // No failure.
     NONE,
 
-    // Failed because there were no expected hashes.
-    NO_HASHES,
+    // Failed because there were no expected hashes at all (eg they haven't
+    // been fetched yet).
+    MISSING_ALL_HASHES,
+
+    // Failed because this file wasn't found in the list of expected hashes.
+    NO_HASHES_FOR_FILE,
 
     // Some of the content read did not match the expected hash.
     HASH_MISMATCH
   };
   typedef base::Callback<void(FailureReason)> FailureCallback;
 
   // The |failure_callback| will be called at most once if there was a failure.
   ContentVerifyJob(ContentHashReader* hash_reader,
                    const FailureCallback& failure_callback);
 
@@ skipping 25 matching lines @@
 
   static void SetDelegateForTests(TestDelegate* delegate);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentVerifyJob);
 
   virtual ~ContentVerifyJob();
   friend class base::RefCountedThreadSafe<ContentVerifyJob>;
 
   // Called each time we're done adding bytes for the current block, and are
-  // ready to finish the hash operation for those bytes and make sure it matches
-  // what was expected for that block.
-  void FinishBlock();
+  // ready to finish the hash operation for those bytes and make sure it
+  // matches what was expected for that block. Returns true if everything is
+  // still ok so far, or false if a mismatch was detected.
+  bool FinishBlock();
 
   // Dispatches the failure callback with the given reason.
   void DispatchFailureCallback(FailureReason reason);
 
   // Called when our ContentHashReader has finished initializing.
   void OnHashesReady(bool success);
 
   // Indicates whether the caller has told us they are done calling BytesRead.
   bool done_reading_;
 
@@ skipping 14 matching lines @@
   scoped_ptr<crypto::SecureHash> current_hash_;
 
   // The number of bytes we've already input into |current_hash_|.
   int current_hash_byte_count_;
 
   scoped_refptr<ContentHashReader> hash_reader_;
 
   // Called once if verification fails.
   FailureCallback failure_callback_;
 
+  // Set to true if we detected a mismatch and called the failure callback.
+  bool failed_;
+
   // For ensuring methods on called on the right thread.
   base::ThreadChecker thread_checker_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_CONTENT_VERIFY_JOB_H_