Decouple killbit testing from external extension providers

chrome/browser/extensions/extension_management_browsertest.cc

 // Copyright (c) 2009 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 "base/ref_counted.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 275 matching lines @@
   const ExtensionList* extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ(kExtensionId, extensions->at(size_before)->id());
   ASSERT_EQ("2.0", extensions->at(size_before)->VersionString());
 
   // Uninstalling the extension should set a pref that keeps the extension from
   // being installed again the next time external_extensions.json is read.
 
   UninstallExtension(kExtensionId);
 
-  std::set<std::string> killed_ids;
-  service->extension_prefs()->GetKilledExtensionIds(&killed_ids);
-  EXPECT_TRUE(killed_ids.end() != killed_ids.find(kExtensionId))
+  ExtensionPrefs* extension_prefs = service->extension_prefs();
+  EXPECT_TRUE(extension_prefs->IsExtensionKilled(kExtensionId))
       << "Uninstalling should set kill bit on externaly installed extension.";
 
+  // Try to install the extension again from an external source. It should fail
+  // because of the killbit.
+  service->AddPendingExtensionFromExternalUpdateUrl(
+      kExtensionId, GURL("http://localhost/autoupdate/manifest"),
+      Extension::EXTERNAL_PREF_DOWNLOAD);
+  const PendingExtensionMap& pending_extensions =
+      service->pending_extensions();
+  EXPECT_TRUE(
+      pending_extensions.find(kExtensionId) == pending_extensions.end())
+      << "External reinstall of a killed extension shouldn't work.";
+  EXPECT_TRUE(extension_prefs->IsExtensionKilled(kExtensionId))
+      << "External reinstall of a killed extension should leave it killed.";
+
   // Installing from non-external source.
   ASSERT_TRUE(InstallExtension(basedir.AppendASCII("v2.crx"), 1));
 
-  killed_ids.clear();
-  service->extension_prefs()->GetKilledExtensionIds(&killed_ids);
-  EXPECT_TRUE(killed_ids.end() == killed_ids.find(kExtensionId))
+  EXPECT_FALSE(extension_prefs->IsExtensionKilled(kExtensionId))
       << "Reinstalling should clear the kill bit.";
 
   // Uninstalling from a non-external source should not set the kill bit.
   UninstallExtension(kExtensionId);
 
-  killed_ids.clear();
-  service->extension_prefs()->GetKilledExtensionIds(&killed_ids);
-  EXPECT_TRUE(killed_ids.end() == killed_ids.find(kExtensionId))
+  EXPECT_FALSE(extension_prefs->IsExtensionKilled(kExtensionId))
       << "Uninstalling non-external extension should not set kill bit.";
 }
 
 // See http://crbug.com/57378 for flakiness details.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
   const char* kExtensionId = "ogjcoiohnmldgjemafoockdghcjciccf";
   // We don't want autoupdate blacklist checks.
   service->updater()->set_blacklist_checks_enabled(false);
 
@@ skipping 27 matching lines @@
   ASSERT_EQ(size_before + 1, extensions->size());
   ASSERT_EQ(kExtensionId, extensions->at(size_before)->id());
   EXPECT_EQ("2.0", extensions->at(size_before)->VersionString());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD,
             extensions->at(size_before)->location());
 
   // Check that emptying the list doesn't cause any trouble.
   prefs->ClearPref(prefs::kExtensionInstallForceList);
   prefs->pref_notifier()->FireObservers(prefs::kExtensionInstallForceList);
 }