Change Extensions.ExternalItemState to report more specific data (enabled

chrome/browser/extensions/installed_loader.cc

 // Copyright (c) 2012 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/installed_loader.h"
 
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 43 matching lines @@
 };
 
 // Used in histogram Extension.BackgroundPageType. Values may be added, as
 // long as existing values are not changed.
 enum BackgroundPageType {
   NO_BACKGROUND_PAGE = 0,
   BACKGROUND_PAGE_PERSISTENT = 1,
   EVENT_PAGE = 2,
 };
 
+// Used in histogram Extensions.ExternalItemState. Values may be added, as
+// long as existing values are not changed.
+enum ExternalItemState {
+  DEPRECATED_EXTERNAL_ITEM_DISABLED = 0,
+  DEPRECATED_EXTERNAL_ITEM_ENABLED = 1,
+  EXTERNAL_ITEM_WEBSTORE_DISABLED = 2,
+  EXTERNAL_ITEM_WEBSTORE_ENABLED = 3,
+  EXTERNAL_ITEM_NONWEBSTORE_DISABLED = 4,
+  EXTERNAL_ITEM_NONWEBSTORE_ENABLED = 5,
+  EXTERNAL_ITEM_MAX_ITEMS = 6
+};
+
 ManifestReloadReason ShouldReloadExtensionManifest(const ExtensionInfo& info) {
   // Always reload manifests of unpacked extensions, because they can change
   // on disk independent of the manifest in our prefs.
   if (Manifest::IsUnpackedLocation(info.extension_location))
     return UNPACKED_DIR;
 
   // Reload the manifest if it needs to be relocalized.
   if (extension_l10n_util::ShouldRelocalizeManifest(
           info.extension_manifest.get()))
     return NEEDS_RELOCALIZATION;
@@ skipping 186 matching lines @@
     } else if (type == Manifest::TYPE_EXTENSION) {
       UMA_HISTOGRAM_ENUMERATION("Extensions.ExtensionLocation",
                                 location, 100);
     }
     if (!ManifestURL::UpdatesFromGallery(*ex)) {
       UMA_HISTOGRAM_ENUMERATION("Extensions.NonWebstoreLocation",
                                 location, 100);
     }
     if (Manifest::IsExternalLocation(location)) {
       // See loop below for DISABLED.
-      UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
-                                Extension::ENABLED, 100);
+      if (ManifestURL::UpdatesFromGallery(*ex)) {
+        UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
+                                  EXTERNAL_ITEM_WEBSTORE_ENABLED,
+                                  EXTERNAL_ITEM_MAX_ITEMS);
+      } else {
+        UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
+                                  EXTERNAL_ITEM_NONWEBSTORE_ENABLED,
+                                  EXTERNAL_ITEM_MAX_ITEMS);
+      }
     }
     if ((*ex)->from_webstore()) {
       // Check for inconsistencies if the extension was supposedly installed
       // from the webstore.
       enum {
         BAD_UPDATE_URL = 0,
-        IS_EXTERNAL = 1,
+        // This value was a mistake. Turns out sideloaded extensions can
+        // have the from_webstore bit if they update from the webstore.
+        DEPRECATED_IS_EXTERNAL = 1,
       };
       if (!ManifestURL::UpdatesFromGallery(*ex)) {
         UMA_HISTOGRAM_ENUMERATION("Extensions.FromWebstoreInconsistency",
                                   BAD_UPDATE_URL, 2);
-      } else if (Manifest::IsExternalLocation(location)) {
-        UMA_HISTOGRAM_ENUMERATION("Extensions.FromWebstoreInconsistency",
-                                  IS_EXTERNAL, 2);
       }
     }
 
     // Don't count component extensions, since they are only extensions as an
     // implementation detail.
     if (location == Manifest::COMPONENT)
       continue;
     // Histogram for non-webstore extensions overriding new tab page should
     // include unpacked extensions.
     if (!(*ex)->from_webstore()) {
@@ skipping 81 matching lines @@
   const ExtensionSet* disabled_extensions =
       extension_service_->disabled_extensions();
   for (ex = disabled_extensions->begin();
        ex != disabled_extensions->end(); ++ex) {
     if (extension_service_->extension_prefs()->
         DidExtensionEscalatePermissions((*ex)->id())) {
       ++disabled_for_permissions_count;
     }
     if (Manifest::IsExternalLocation((*ex)->location())) {
       // See loop above for ENABLED.
-      UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
-                                Extension::DISABLED, 100);
+      if (ManifestURL::UpdatesFromGallery(*ex)) {
+        UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
+                                  EXTERNAL_ITEM_WEBSTORE_DISABLED,
+                                  EXTERNAL_ITEM_MAX_ITEMS);
+      } else {
+        UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState",
+                                  EXTERNAL_ITEM_NONWEBSTORE_DISABLED,
+                                  EXTERNAL_ITEM_MAX_ITEMS);
+      }
     }
   }
 
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAllUser", item_user_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadApp",
                            app_user_count + app_external_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAppUser", app_user_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadAppExternal", app_external_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadHostedApp", hosted_app_count);
   UMA_HISTOGRAM_COUNTS_100("Extensions.LoadPackagedApp",
@@ skipping 20 matching lines @@
 int InstalledLoader::GetCreationFlags(const ExtensionInfo* info) {
   int flags = extension_prefs_->GetCreationFlags(info->extension_id);
   if (!Manifest::IsUnpackedLocation(info->extension_location))
     flags |= Extension::REQUIRE_KEY;
   if (extension_prefs_->AllowFileAccess(info->extension_id))
     flags |= Extension::ALLOW_FILE_ACCESS;
   return flags;
 }
 
 }  // namespace extensions