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

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 2010 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 <list>
+#include <set>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #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"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/convert_user_script.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
@@ skipping 13 matching lines @@
 namespace {
 
 // Helper function to delete files. This is used to avoid ugly casts which
 // would be necessary with PostMessage since file_util::Delete is overloaded.
 static void DeleteFileHelper(const FilePath& path, bool recursive) {
   file_util::Delete(path, recursive);
 }
 
 struct WhitelistedInstallData {
   WhitelistedInstallData() {}
-  std::list<std::string> ids;
+  std::set<std::string> ids;
 };
 
 }  // namespace
 
 // 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;
 }
 
 CrxInstaller::CrxInstaller(const FilePath& install_directory,
                            ExtensionsService* frontend,
                            ExtensionInstallUI* client)
     : install_directory_(install_directory),
       install_source_(Extension::INTERNAL),
       delete_source_(false),
       allow_privilege_increase_(false),
@@ skipping 207 matching lines @@
     ReportFailureFromUIThread(l10n_util::GetStringFUTF8(
         IDS_EXTENSION_OVERLAPPING_WEB_EXTENT,
         UTF8ToUTF16(overlapping_extension->name())));
     return;
   }
 
   current_version_ =
       frontend_->extension_prefs()->GetVersionString(extension_->id());
 
   bool whitelisted = ClearWhitelistedInstallId(extension_->id()) &&
-      extension_->plugins().empty();
+      extension_->plugins().empty() && is_gallery_install_;
 
   if (client_ &&
       (!allow_silent_install_ || !whitelisted)) {
     AddRef();  // Balanced in Proceed() and Abort().
     client_->ConfirmInstall(this, extension_.get());
   } else {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(this, &CrxInstaller::CompleteInstall));
   }
@@ skipping 98 matching lines @@
     client_->OnInstallSuccess(extension_.get());
 
   // Tell the frontend about the installation and hand off ownership of
   // extension_ to it.
   frontend_->OnExtensionInstalled(extension_, allow_privilege_increase_);
   extension_ = NULL;
 
   // We're done. We don't post any more tasks to ourselves so we are deleted
   // soon.
 }