Fix content verifier problem with content scripts (reland)

extensions/browser/content_verifier.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_verifier.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/content_hash_fetcher.h"
 #include "extensions/browser/content_hash_reader.h"
 #include "extensions/browser/content_verifier_delegate.h"
 #include "extensions/browser/content_verifier_io_data.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_l10n_util.h"
 
 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),
       context_(context),
       delegate_(delegate),
       fetcher_(new ContentHashFetcher(
           context,
           delegate,
           base::Bind(&ContentVerifier::OnFetchComplete, this))),
       observer_(this),
@@ skipping 148 matching lines @@
                                             bool shouldVerifyAnyPathsResult) {
   if (shouldVerifyAnyPathsResult)
     delegate_->VerifyFailed(extension_id, ContentVerifyJob::MISSING_ALL_HASHES);
 }
 
 void ContentVerifier::OnFetchComplete(
     const std::string& extension_id,
     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;
 
   VLOG(1) << "OnFetchComplete " << extension_id << " success:" << success;
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(context_);
   const Extension* extension =
       registry->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
   if (!delegate_ || !extension)
     return;
@@ skipping 61 matching lines @@
           !extension_l10n_util::ShouldSkipValidation(
               locales_dir, full_path.DirName(), *all_locales))
         continue;
     }
     return true;
   }
   return false;
 }
 
 }  // namespace extensions