Beginnings of the script bubble.

chrome/browser/extensions/component_loader_unittest.cc

Index: chrome/browser/extensions/component_loader_unittest.cc
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index e076ba10c5c9739e99e609cc3398ee07a3d25d89..6cc790e0c9d9b61385aeb3ad71d17b6fec8c6909 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -169,20 +169,21 @@ TEST_F(ComponentLoaderTest, ParseManifest) {
 
 // Test that the extension isn't loaded if the extension service isn't ready.
 TEST_F(ComponentLoaderTest, AddWhenNotReady) {
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(false);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_EQ((Extension*)NULL, extension.get());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_FALSE(extension_id.empty());

[Jeffrey Yasskin, 2012/10/02 00:26:31]

I wonder if ASSERT_NE("", extension_id) would give more useful information on
failure. (Or EXPECT)

[Aaron Boodman, 2012/10/02 01:28:52]

Done, throughout.

   ASSERT_EQ(0u, extension_service_.extensions()->size());
 }
 
 // Test that it *is* loaded when the extension service *is* ready.
 TEST_F(ComponentLoaderTest, AddWhenReady) {
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(true);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_NE((Extension*)NULL, extension.get());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_FALSE(extension_id.empty());
   ASSERT_EQ(1u, extension_service_.extensions()->size());
+  ASSERT_TRUE(extension_service_.extensions()->GetByID(extension_id));
 }
 
 TEST_F(ComponentLoaderTest, Remove) {
@@ -199,10 +200,10 @@ TEST_F(ComponentLoaderTest, Remove) {
   ASSERT_EQ(0u, extension_service_.extensions()->size());
 
   // Load an extension, and check that it's unloaded when Remove() is called.
-  scoped_refptr<const Extension> extension;
   extension_service_.set_ready(true);
-  extension = component_loader_.Add(manifest_contents_, extension_path_);
-  ASSERT_NE((Extension*)NULL, extension.get());
+  std::string extension_id =
+      component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_EQ(1u, extension_service_.extensions()->size());
   component_loader_.Remove(extension_path_);
   ASSERT_EQ(0u, extension_service_.extensions()->size());