Fix content verifier problem with content scripts (reland)

extensions/browser/content_verifier.cc

Index: extensions/browser/content_verifier.cc
diff --git a/extensions/browser/content_verifier.cc b/extensions/browser/content_verifier.cc
index b85e8eeebcac6f77b6bac1d0b7f300b2568cfd45..eaafe8f403bb2175063aa12d9ab6fe82cbceca63 100644
--- a/extensions/browser/content_verifier.cc
+++ b/extensions/browser/content_verifier.cc
@@ -20,6 +20,17 @@
 
 namespace extensions {
 
+namespace {
+
+ContentVerifier::TestObserver* g_test_observer = NULL;
+
+}  // namespace
+
+// static
+void ContentVerifier::SetObserverForTests(TestObserver* observer) {
+  g_test_observer = observer;
+}
+
 ContentVerifier::ContentVerifier(content::BrowserContext* context,
                                  ContentVerifierDelegate* delegate)
     : shutdown_(false),
@@ -188,6 +199,9 @@ void ContentVerifier::OnFetchComplete(
     bool success,
     bool was_force_check,
     const std::set<base::FilePath>& hash_mismatch_paths) {
+  if (g_test_observer)
+    g_test_observer->OnFetchComplete(extension_id, success);
+
   if (shutdown_)
     return;