Beginnings of the script bubble.

chrome/browser/extensions/component_loader_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 151 matching lines @@
   ASSERT_EQ(2, value);
 
   std::string string_value;
   manifest.reset(component_loader_.ParseManifest(manifest_contents_));
   ASSERT_TRUE(manifest->GetString("background.page", &string_value));
   ASSERT_EQ("backgroundpage.html", string_value);
 }
 
 // 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) {
   extension_service_.set_ready(false);
 
   // Removing an extension that was never added should be ok.
   component_loader_.Remove(extension_path_);
   ASSERT_EQ(0u, extension_service_.extensions()->size());
 
   // Try adding and removing before LoadAll() is called.
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.Remove(extension_path_);
   component_loader_.LoadAll();
   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());
 
   // And after calling LoadAll(), it shouldn't get loaded.
   component_loader_.LoadAll();
   ASSERT_EQ(0u, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, LoadAll) {
   extension_service_.set_ready(false);
@@ skipping 64 matching lines @@
   ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
   ASSERT_EQ(0u, extension_service_.unloaded_count());
 
   // replace loaded component extension.
   component_loader_.AddOrReplace(known_extension);
   ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
   ASSERT_EQ(1u, extension_service_.unloaded_count());
 }
 
 }  // namespace extensions