Split the private webstore install API into two parts....

chrome/browser/extensions/crx_installer.cc

Index: chrome/browser/extensions/crx_installer.cc
===================================================================
--- chrome/browser/extensions/crx_installer.cc	(revision 65457)
+++ chrome/browser/extensions/crx_installer.cc	(working copy)
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/crx_installer.h"
 
-#include <list>
+#include <set>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -12,6 +12,7 @@
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/singleton.h"
+#include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/thread_restrictions.h"
@@ -45,7 +46,7 @@
 
 struct WhitelistedInstallData {
   WhitelistedInstallData() {}
-  std::list<std::string> ids;
+  std::set<std::string> ids;
 };
 
 }  // namespace
@@ -53,25 +54,24 @@
 // static
 void CrxInstaller::SetWhitelistedInstallId(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Singleton<WhitelistedInstallData>::get()->ids.push_back(id);
+  Singleton<WhitelistedInstallData>::get()->ids.insert(id);
 }
 
 // static
+bool CrxInstaller::IsIdWhitelisted(const std::string& id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  std::set<std::string>& ids = Singleton<WhitelistedInstallData>::get()->ids;
+  return ContainsKey(ids, id);
+}
+
+// static
 bool CrxInstaller::ClearWhitelistedInstallId(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  std::list<std::string>& ids = Singleton<WhitelistedInstallData>::get()->ids;
-  std::list<std::string>::iterator iter = ids.begin();
-  for (; iter != ids.end(); ++iter) {
-    if (*iter == id) {
-      break;
-    }
-  }
-
-  if (iter != ids.end()) {
-    ids.erase(iter);
+  std::set<std::string>& ids = Singleton<WhitelistedInstallData>::get()->ids;
+  if (ContainsKey(ids, id)) {
+    ids.erase(id);
     return true;
   }
-
   return false;
 }
 
@@ -299,7 +299,7 @@
       frontend_->extension_prefs()->GetVersionString(extension_->id());
 
   bool whitelisted = ClearWhitelistedInstallId(extension_->id()) &&
-      extension_->plugins().empty();
+      extension_->plugins().empty() && is_gallery_install_;

[Erik does not do reviews, 2010/11/09 16:32:21]

just curious, why is this extra test necessary?  don't we check this on the way
into the whitelist?

[asargent_no_longer_on_chrome, 2010/11/10 00:23:48]

I don't think it's strictly necessary, but since our download code already sets
this flag it seemed like a useful "defense in depth" check to throw in. 

 
   if (client_ &&
       (!allow_silent_install_ || !whitelisted)) {