More implementation details of extension content verification

chrome/browser/extensions/extension_system_impl.cc

Index: chrome/browser/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 924890a3d5d922ef5ac31bfb8afba99540c2028f..3f5c3b3a54b4fc162033eca07652ca443ab632d0 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -139,12 +139,6 @@ void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
-static bool ShouldVerifyExtensionContent(const Extension* extension) {
-  return ((extension->is_extension() || extension->is_legacy_packaged_app()) &&
-          ManifestURL::UpdatesFromGallery(extension) &&
-          Manifest::IsAutoUpdateableLocation(extension->location()));
-}
-
 void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
@@ -179,9 +173,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
     install_verifier_.reset(
         new InstallVerifier(ExtensionPrefs::Get(profile_), profile_));
     install_verifier_->Init();
-    ContentVerifierFilter filter = base::Bind(&ShouldVerifyExtensionContent);
-    content_verifier_ = new ContentVerifier(profile_, filter);
-    content_verifier_->AddObserver(extension_service_.get());
+    content_verifier_ = new ContentVerifier(profile_, extension_service_.get());
     content_verifier_->Start();
     info_map()->SetContentVerifier(content_verifier_.get());
 
@@ -257,8 +249,6 @@ void ExtensionSystemImpl::Shared::Shutdown() {
         extension_warning_badge_service_.get());
   }
   if (content_verifier_) {
-    if (extension_service_)
-      content_verifier_->RemoveObserver(extension_service_.get());
     content_verifier_->Shutdown();
   }