Decouple killbit testing from external extension providers

chrome/browser/extensions/extensions_service_unittest.cc

Index: chrome/browser/extensions/extensions_service_unittest.cc
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 3adc05b4c3f9ca73ec3a43930045b23c0e506d29..2f425161deab58bc649d16306c556f8f65a30fed 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -140,13 +140,10 @@ class MockExtensionProvider : public ExternalExtensionProvider {
   }
 
   // ExternalExtensionProvider implementation:
-  virtual void VisitRegisteredExtension(
-      Visitor* visitor, const std::set<std::string>& ids_to_ignore) const {
+  virtual void VisitRegisteredExtension(Visitor* visitor) const {
     visit_count_++;
     for (DataMap::const_iterator i = extension_map_.begin();
          i != extension_map_.end(); ++i) {
-      if (ids_to_ignore.find(i->first) != ids_to_ignore.end())
-        continue;
       scoped_ptr<Version> version;
       version.reset(Version::GetVersionFromString(i->second.first));
 
@@ -198,8 +195,7 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
   MockProviderVisitor() : ids_found_(0) {
   }
 
-  int Visit(const std::string& json_data,
-            const std::set<std::string>& ignore_list) {
+  int Visit(const std::string& json_data) {
     // Give the test json file to the provider for parsing.
     provider_.reset(new ExternalPrefExtensionProvider());
     provider_->SetPreferencesForTesting(json_data);
@@ -220,9 +216,8 @@ class MockProviderVisitor : public ExternalExtensionProvider::Visitor {
 
     // Reset our counter.
     ids_found_ = 0;
-    // Ask the provider to look up all extensions (and return the ones
-    // found (that are not on the ignore list).
-    provider_->VisitRegisteredExtension(this, ignore_list);
+    // Ask the provider to look up all extensions and return them.
+    provider_->VisitRegisteredExtension(this);
 
     return ids_found_;
   }
@@ -2827,14 +2822,6 @@ TEST_F(ExtensionsServiceTest, ExternalPrefProvider) {
       "}";
 
   MockProviderVisitor visitor;
-  std::set<std::string> ignore_list;
-  EXPECT_EQ(3, visitor.Visit(json_data, ignore_list));
-  ignore_list.insert("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-  EXPECT_EQ(2, visitor.Visit(json_data, ignore_list));
-  ignore_list.insert("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
-  EXPECT_EQ(1, visitor.Visit(json_data, ignore_list));
-  ignore_list.insert("cccccccccccccccccccccccccccccccc");
-  EXPECT_EQ(0, visitor.Visit(json_data, ignore_list));
 
   // Simulate an external_extensions.json file that contains seven invalid
   // extensions:
@@ -2878,8 +2865,7 @@ TEST_F(ExtensionsServiceTest, ExternalPrefProvider) {
       "    \"external_version\": \"1.0\""
       "  }"
       "}";
-  ignore_list.clear();
-  EXPECT_EQ(1, visitor.Visit(json_data, ignore_list));
+  EXPECT_EQ(1, visitor.Visit(json_data));
 }
 
 // Test loading good extensions from the profile directory.