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

chrome/browser/extensions/extension_system_impl.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 "chrome/browser/extensions/extension_system_impl.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 204 matching lines @@
     replacements.SetQuery(query.c_str(), url::Component(0, query.length()));
     return base_url.ReplaceComponents(replacements);
   }
 
   virtual std::set<base::FilePath> GetBrowserImagePaths(
       const extensions::Extension* extension) OVERRIDE {
     return extension_file_util::GetBrowserImagePaths(extension);
   }
 
   virtual void VerifyFailed(const std::string& extension_id) OVERRIDE {
-    if (service_)
+    if (!service_)
+      return;
+    ExtensionRegistry* registry = ExtensionRegistry::Get(service_->profile());
+    const Extension* extension =
+        registry->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
+    if (!extension)
+      return;
+    Mode mode = ShouldBeVerified(*extension);
+    if (mode >= ContentVerifierDelegate::ENFORCE)
       service_->DisableExtension(extension_id, Extension::DISABLE_CORRUPTED);
   }
 
   static Mode GetDefaultMode() {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     Mode experiment_value = NONE;
     const std::string group = base::FieldTrialList::FindFullName(
         kContentVerificationExperimentName);
     if (group == "EnforceStrict")
@@ skipping 81 matching lines @@
     install_verifier_.reset(
         new InstallVerifier(ExtensionPrefs::Get(profile_), profile_));
     install_verifier_->Init();
     content_verifier_ = new ContentVerifier(
         profile_, new ContentVerifierDelegateImpl(extension_service_.get()));
     ContentVerifierDelegate::Mode mode =
         ContentVerifierDelegateImpl::GetDefaultMode();
 #if defined(OS_CHROMEOS)
     mode = std::max(mode, ContentVerifierDelegate::BOOTSTRAP);
 #endif
-    if (mode > ContentVerifierDelegate::BOOTSTRAP)
+    if (mode >= ContentVerifierDelegate::BOOTSTRAP)
       content_verifier_->Start();
     info_map()->SetContentVerifier(content_verifier_.get());
 
     management_policy_.reset(new ManagementPolicy);
     RegisterManagementPolicyProviders();
   }
 
   bool skip_session_extensions = false;
 #if defined(OS_CHROMEOS)
   // Skip loading session extensions if we are not in a user session.
@@ skipping 274 matching lines @@
 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
     const std::string& extension_id,
     const UnloadedExtensionInfo::Reason reason) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason));
 }
 
 }  // namespace extensions