A bunch of remaining parts of extension content verification (Reland)

extensions/browser/content_hash_fetcher.h

Index: extensions/browser/content_hash_fetcher.h
diff --git a/extensions/browser/content_hash_fetcher.h b/extensions/browser/content_hash_fetcher.h
index 60d746f4b29b6f8ddd9597f8d03c2ef040b0d694..d437d8f10949a9098777f663015d65db11d9d35a 100644
--- a/extensions/browser/content_hash_fetcher.h
+++ b/extensions/browser/content_hash_fetcher.h
@@ -5,6 +5,7 @@
 #ifndef EXTENSIONS_BROWSER_CONTENT_HASH_FETCHER_H_
 #define EXTENSIONS_BROWSER_CONTENT_HASH_FETCHER_H_
 
+#include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "extensions/browser/content_verifier_delegate.h"
 #include "extensions/browser/extension_registry_observer.h"
@@ -17,6 +18,7 @@ class BrowserContext;
 namespace extensions {
 
 class ExtensionRegistry;
+class ContentHashFetcherJob;
 
 // This class is responsible for getting signed expected hashes for use in
 // extension content verification. As extensions are loaded it will fetch and
@@ -48,12 +50,25 @@ class ContentHashFetcher : public ExtensionRegistryObserver {
       UnloadedExtensionInfo::Reason reason) OVERRIDE;
 
  private:
+  // Callback for when a job getting content hashes has completed.
+  void JobFinished(ContentHashFetcherJob* job);
+
   content::BrowserContext* context_;
   ContentVerifierDelegate* delegate_;
 
+  // We keep around pointers to in-progress jobs, both so we can avoid
+  // scheduling duplicate work if fetching is already in progress, and so that
+  // we can cancel in-progress work at shutdown time.
+  typedef std::pair<ExtensionId, std::string> IdAndVersion;
+  typedef std::map<IdAndVersion, scoped_refptr<ContentHashFetcherJob> > JobMap;
+  JobMap jobs_;
+
   // For observing the ExtensionRegistry.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> observer_;
 
+  // Used for binding callbacks passed to jobs.
+  base::WeakPtrFactory<ContentHashFetcher> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentHashFetcher);
 };