Revert 247790 "Change default mode of extension install verifica..."

trunk/src/chrome/browser/extensions/install_verifier.cc

 // Copyright 2013 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/install_verifier.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "extensions/common/manifest.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 enum VerifyStatus {
   NONE = 0,   // Do not request install signatures, and do not enforce them.
   BOOTSTRAP,  // Request install signatures, but do not enforce them.
   ENFORCE,    // Request install signatures, and enforce them.
-
-  // This is used in histograms - do not remove or reorder entries above! Also
-  // the "MAX" item below should always be the last element.
-
-  VERIFY_STATUS_MAX
 };
 
 #if defined(GOOGLE_CHROME_BUILD)
 const char kExperimentName[] = "ExtensionInstallVerification";
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
 VerifyStatus GetExperimentStatus() {
 #if defined(GOOGLE_CHROME_BUILD)
   const std::string group = base::FieldTrialList::FindFullName(
       kExperimentName);
 
   std::string forced_trials = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kForceFieldTrials);
   if (forced_trials.find(kExperimentName) != std::string::npos) {
     // We don't want to allow turning off enforcement by forcing the field
     // trial group to something other than enforcement.
     return ENFORCE;
   }
 
-  VerifyStatus default_status = NONE;
+  VerifyStatus default_status = BOOTSTRAP;
 
   if (group == "Enforce")
     return ENFORCE;
   else if (group == "Bootstrap")
     return BOOTSTRAP;
   else if (group == "None" || group == "Control")
     return NONE;
   else
     return default_status;
 #endif  // defined(GOOGLE_CHROME_BUILD)
@@ skipping 71 matching lines @@
 }
 
 }  // namespace
 
 // static
 bool InstallVerifier::NeedsVerification(const Extension& extension) {
   return FromStore(extension) && CanUseExtensionApis(extension);
 }
 
 void InstallVerifier::Init() {
-  UMA_HISTOGRAM_ENUMERATION("ExtensionInstallVerifier.ExperimentStatus",
-                            GetExperimentStatus(), VERIFY_STATUS_MAX);
-  UMA_HISTOGRAM_ENUMERATION("ExtensionInstallVerifier.ActualStatus",
-                            GetStatus(), VERIFY_STATUS_MAX);
-
   const base::DictionaryValue* pref = prefs_->GetInstallSignature();
   if (pref) {
     scoped_ptr<InstallSignature> signature_from_prefs =
         InstallSignature::FromValue(*pref);
     if (!signature_from_prefs.get()) {
       LogInitResultHistogram(INIT_UNPARSEABLE_PREF);
     } else if (!InstallSigner::VerifySignature(*signature_from_prefs.get())) {
       LogInitResultHistogram(INIT_INVALID_SIGNATURE);
       DVLOG(1) << "Init - ignoring invalid signature";
     } else {
@@ skipping 322 matching lines @@
     if (!operation->callback.is_null())
       operation->callback.Run(success);
   }
 
   if (!operation_queue_.empty())
     BeginFetch();
 }
 
 
 }  // namespace extensions