Additional metrics for disabled extensions and content verification

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"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
+#include "base/metrics/histogram.h"
 #include "base/strings/string_tokenizer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 197 matching lines @@
   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_)
       return;
     ExtensionRegistry* registry = ExtensionRegistry::Get(service_->profile());
     const Extension* extension =
-        registry->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
+        registry->GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
     if (!extension)
       return;
     Mode mode = ShouldBeVerified(*extension);
-    if (mode >= ContentVerifierDelegate::ENFORCE)
+    if (mode >= ContentVerifierDelegate::ENFORCE) {
       service_->DisableExtension(extension_id, Extension::DISABLE_CORRUPTED);
+      ExtensionPrefs::Get(service_->profile())
+          ->IncrementCorruptedDisableCount();
+      UMA_HISTOGRAM_BOOLEAN("Extensions.CorruptExtensionBecameDisabled", true);
+    } else if (!ContainsKey(would_be_disabled_ids_, extension_id)) {

[Ken Rockot(use gerrit already), 2014/07/24 03:56:01]

Your choice between readability vs efficiency here, but you could also:

} else if (would_be_disabled_ids_.insert(extension_id).second) {
  UMA_HISTOGRAM(...);
}

to get the test and insert in one operation.

[asargent_no_longer_on_chrome, 2014/07/24 17:08:12]

I'm going to pick readability, since this won't be called very frequently and
even when it is, the insert only happens once for a given id. 

+      UMA_HISTOGRAM_BOOLEAN("Extensions.CorruptExtensionWouldBeDisabled", true);
+      would_be_disabled_ids_.insert(extension_id);
+    }
   }
 
   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")
       experiment_value = ContentVerifierDelegate::ENFORCE_STRICT;
@@ skipping 34 matching lines @@
 
     // We don't want to allow the command-line flags to eg disable enforcement
     // if the experiment group says it should be on, or malware may just modify
     // the command line flags. So return the more restrictive of the 2 values.
     return std::max(experiment_value, cmdline_value);
   }
 
  private:
   base::WeakPtr<ExtensionService> service_;
   ContentVerifierDelegate::Mode default_mode_;
+
+  // For reporting metrics in BOOTSTRAP mode, when an extension would be
+  // disabled if content verification was in ENFORCE mode.
+  std::set<std::string> would_be_disabled_ids_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentVerifierDelegateImpl);
 };
 
 }  // namespace
 
 void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   navigation_observer_.reset(new NavigationObserver(profile_));
 
@@ skipping 321 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