Merge 88204 - Partially deprecate the old webstorePrivate.beginInstall method

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 2011 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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/file_util.h"
@@ skipping 374 matching lines @@
       overlapping_extension->id() != extension_->id()) {
     ReportFailureFromUIThread(l10n_util::GetStringFUTF8(
         IDS_EXTENSION_OVERLAPPING_WEB_EXTENT,
         UTF8ToUTF16(overlapping_extension->name())));
     return;
   }
 
   current_version_ =
       frontend_weak_->extension_prefs()->GetVersionString(extension_->id());
 
-  // First see if it's whitelisted by id (the old mechanism).
-  bool whitelisted = ClearWhitelistedInstallId(extension_->id()) &&
-      extension_->plugins().empty() && is_gallery_install_;
+  // TODO(asargent) - remove this when we fully deprecate the old install api.
+  ClearWhitelistedInstallId(extension_->id());
 
-  // Now check if there's a WhitelistEntry.
+  bool whitelisted = false;
   scoped_ptr<CrxInstaller::WhitelistEntry> entry(
       RemoveWhitelistEntry(extension_->id()));
   if (is_gallery_install_ && entry.get() && original_manifest_.get()) {
     if (!(original_manifest_->Equals(entry->parsed_manifest.get()))) {
       ReportFailureFromUIThread(
           l10n_util::GetStringUTF8(IDS_EXTENSION_MANIFEST_INVALID));
       return;
     }
     whitelisted = true;
   }
@@ skipping 152 matching lines @@
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they can not filter based
   // on the extension.
   NotificationService::current()->Notify(
       NotificationType::CRX_INSTALLER_DONE,
       Source<CrxInstaller>(this),
       NotificationService::NoDetails());
 }