Fix extension install verification for v1 packaged apps

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 105 matching lines @@
   // the "MAX" item below should always be the last element.
 
   INIT_RESULT_MAX
 };
 
 void LogInitResultHistogram(InitResult result) {
   UMA_HISTOGRAM_ENUMERATION("ExtensionInstallVerifier.InitResult",
                             result, INIT_RESULT_MAX);
 }
 
+bool FromStore(const Extension& extension) {
+  bool updates_from_store = ManifestURL::UpdatesFromGallery(&extension);
+  return extension.from_webstore() || updates_from_store;
+}
+
+bool CanUseExtensionApis(const Extension& extension) {
+  return extension.is_extension() || extension.is_legacy_packaged_app();
+}
+
 }  // namespace
 
+// static
+bool InstallVerifier::NeedsVerification(const Extension& extension) {
+  return FromStore(extension) && CanUseExtensionApis(extension);
+}
+
 void InstallVerifier::Init() {
   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";
@@ skipping 83 matching lines @@
 
   operation_queue_.push(linked_ptr<PendingOperation>(operation));
   if (operation_queue_.size() == 1)
     BeginFetch();
 }
 
 std::string InstallVerifier::GetDebugPolicyProviderName() const {
   return std::string("InstallVerifier");
 }
 
-static bool FromStore(const Extension* extension) {
-  bool updates_from_store = ManifestURL::UpdatesFromGallery(extension);
-  return extension->from_webstore() || updates_from_store;
-}
-
 namespace {
 
 enum MustRemainDisabledOutcome {
   VERIFIED = 0,
   NOT_EXTENSION,
   UNPACKED,
   ENTERPRISE_POLICY_ALLOWED,
   FORCED_NOT_VERIFIED,
   NOT_FROM_STORE,
   NO_SIGNATURE,
   NOT_VERIFIED_BUT_NOT_ENFORCING,
   NOT_VERIFIED,
 
   // This is used in histograms - do not remove or reorder entries above! Also
   // the "MAX" item below should always be the last element.
 
   MUST_REMAIN_DISABLED_OUTCOME_MAX
 };
 
 void MustRemainDisabledHistogram(MustRemainDisabledOutcome outcome) {
   UMA_HISTOGRAM_ENUMERATION("ExtensionInstallVerifier.MustRemainDisabled",
                             outcome, MUST_REMAIN_DISABLED_OUTCOME_MAX);
 }
 
 }  // namespace
 
 bool InstallVerifier::MustRemainDisabled(const Extension* extension,
                                          Extension::DisableReason* reason,
                                          base::string16* error) const {
-  if (!extension->is_extension()) {
+  CHECK(extension);
+  if (!CanUseExtensionApis(*extension)) {
     MustRemainDisabledHistogram(NOT_EXTENSION);
     return false;
   }
   if (Manifest::IsUnpackedLocation(extension->location())) {
     MustRemainDisabledHistogram(UNPACKED);
     return false;
   }
   if (AllowedByEnterprisePolicy(extension->id())) {
     MustRemainDisabledHistogram(ENTERPRISE_POLICY_ALLOWED);
     return false;
   }
 
   bool verified = true;
   MustRemainDisabledOutcome outcome = VERIFIED;
   if (ContainsKey(InstallSigner::GetForcedNotFromWebstore(), extension->id())) {
     verified = false;
     outcome = FORCED_NOT_VERIFIED;
-  } else if (!FromStore(extension)) {
+  } else if (!FromStore(*extension)) {
     verified = false;
     outcome = NOT_FROM_STORE;
   } else if (signature_.get() == NULL) {
     // If we don't have a signature yet, we'll temporarily consider every
     // extension from the webstore verified to avoid false positives on existing
     // profiles hitting this code for the first time, and rely on consumers of
     // this class to check NeedsBootstrap() and schedule a first check so we can
     // get a signature.
     outcome = NO_SIGNATURE;
   } else if (!IsVerified(extension->id())) {
@@ skipping 171 matching lines @@
     if (!operation->callback.is_null())
       operation->callback.Run(success);
   }
 
   if (!operation_queue_.empty())
     BeginFetch();
 }
 
 
 }  // namespace extensions