Remove CreateEmptyExtension from extension_function_test_utils

extensions/browser/extension_registry_unittest.cc

 // Copyright 2013 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 "extensions/browser/extension_registry.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
@@ skipping 70 matching lines @@
   }
 
   ExtensionList loaded_;
   ExtensionList unloaded_;
   ExtensionList installed_;
   ExtensionList uninstalled_;
 };
 
 TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
   ExtensionRegistry registry(NULL);
-  scoped_refptr<Extension> extension1 = test_util::CreateExtensionWithID("id1");
-  scoped_refptr<Extension> extension2 = test_util::CreateExtensionWithID("id2");
-  scoped_refptr<Extension> extension3 = test_util::CreateExtensionWithID("id3");
-  scoped_refptr<Extension> extension4 = test_util::CreateExtensionWithID("id4");
+  scoped_refptr<Extension> extension1 = test_util::CreateEmptyExtension("id1");
+  scoped_refptr<Extension> extension2 = test_util::CreateEmptyExtension("id2");
+  scoped_refptr<Extension> extension3 = test_util::CreateEmptyExtension("id3");
+  scoped_refptr<Extension> extension4 = test_util::CreateEmptyExtension("id4");
 
   // All the sets start empty.
   EXPECT_EQ(0u, registry.enabled_extensions().size());
   EXPECT_EQ(0u, registry.disabled_extensions().size());
   EXPECT_EQ(0u, registry.terminated_extensions().size());
   EXPECT_EQ(0u, registry.blacklisted_extensions().size());
 
   // Extensions can be added to each set.
   registry.AddEnabled(extension1);
   registry.AddDisabled(extension2);
@@ skipping 12 matching lines @@
   EXPECT_EQ(0u, registry.disabled_extensions().size());
   EXPECT_EQ(0u, registry.terminated_extensions().size());
   EXPECT_EQ(0u, registry.blacklisted_extensions().size());
 }
 
 // A simple test of adding and removing things from sets.
 TEST_F(ExtensionRegistryTest, AddAndRemoveExtensionFromRegistry) {
   ExtensionRegistry registry(NULL);
 
   // Adding an extension works.
-  scoped_refptr<Extension> extension = test_util::CreateExtensionWithID("id");
+  scoped_refptr<Extension> extension = test_util::CreateEmptyExtension("id");
   EXPECT_TRUE(registry.AddEnabled(extension));
   EXPECT_EQ(1u, registry.enabled_extensions().size());
 
   // The extension was only added to one set.
   EXPECT_EQ(0u, registry.disabled_extensions().size());
   EXPECT_EQ(0u, registry.terminated_extensions().size());
   EXPECT_EQ(0u, registry.blacklisted_extensions().size());
 
   // Removing an extension works.
   EXPECT_TRUE(registry.RemoveEnabled(extension->id()));
   EXPECT_EQ(0u, registry.enabled_extensions().size());
 
   // Trying to remove an extension that isn't in the set fails cleanly.
   EXPECT_FALSE(registry.RemoveEnabled(extension->id()));
 }
 
 TEST_F(ExtensionRegistryTest, AddExtensionToRegistryTwice) {
   ExtensionRegistry registry(NULL);
-  scoped_refptr<Extension> extension = test_util::CreateExtensionWithID("id");
+  scoped_refptr<Extension> extension = test_util::CreateEmptyExtension("id");
 
   // An extension can exist in two sets at once. It would be nice to eliminate
   // this functionality, but some users of ExtensionRegistry need it.
   EXPECT_TRUE(registry.AddEnabled(extension));
   EXPECT_TRUE(registry.AddDisabled(extension));
 
   EXPECT_EQ(1u, registry.enabled_extensions().size());
   EXPECT_EQ(1u, registry.disabled_extensions().size());
   EXPECT_EQ(0u, registry.terminated_extensions().size());
   EXPECT_EQ(0u, registry.blacklisted_extensions().size());
 }
 
 TEST_F(ExtensionRegistryTest, GetExtensionById) {
   ExtensionRegistry registry(NULL);
 
   // Trying to get an extension fails cleanly when the sets are empty.
   EXPECT_FALSE(
       registry.GetExtensionById("id", ExtensionRegistry::EVERYTHING));
 
-  scoped_refptr<Extension> enabled =
-      test_util::CreateExtensionWithID("enabled");
+  scoped_refptr<Extension> enabled = test_util::CreateEmptyExtension("enabled");
   scoped_refptr<Extension> disabled =
-      test_util::CreateExtensionWithID("disabled");
+      test_util::CreateEmptyExtension("disabled");
   scoped_refptr<Extension> terminated =
-      test_util::CreateExtensionWithID("terminated");
+      test_util::CreateEmptyExtension("terminated");
   scoped_refptr<Extension> blacklisted =
-      test_util::CreateExtensionWithID("blacklisted");
+      test_util::CreateEmptyExtension("blacklisted");
 
   // Add an extension to each set.
   registry.AddEnabled(enabled);
   registry.AddDisabled(disabled);
   registry.AddTerminated(terminated);
   registry.AddBlacklisted(blacklisted);
 
   // Enabled is part of everything and the enabled list.
   EXPECT_TRUE(
       registry.GetExtensionById("enabled", ExtensionRegistry::EVERYTHING));
@@ skipping 54 matching lines @@
 TEST_F(ExtensionRegistryTest, Observer) {
   ExtensionRegistry registry(NULL);
   TestObserver observer;
   registry.AddObserver(&observer);
 
   EXPECT_TRUE(observer.loaded().empty());
   EXPECT_TRUE(observer.unloaded().empty());
   EXPECT_TRUE(observer.installed().empty());
 
   scoped_refptr<const Extension> extension =
-      test_util::CreateExtensionWithID("id");
+      test_util::CreateEmptyExtension("id");
 
   registry.TriggerOnWillBeInstalled(
       extension.get(), false, false, base::EmptyString());
   EXPECT_TRUE(HasSingleExtension(observer.installed(), extension.get()));
 
   registry.AddEnabled(extension);
   registry.TriggerOnLoaded(extension.get());
 
   registry.TriggerOnWillBeInstalled(extension.get(), true, false, "foo");
 
@@ skipping 12 matching lines @@
   registry.TriggerOnUninstalled(extension.get(),
                                 extensions::UNINSTALL_REASON_FOR_TESTING);
   EXPECT_TRUE(observer.installed().empty());
   EXPECT_TRUE(HasSingleExtension(observer.uninstalled(), extension.get()));
 
   registry.RemoveObserver(&observer);
 }
 
 }  // namespace
 }  // namespace extensions