Revert 159653 - Beginnings of the script bubble.

BUG=153137,135503
TBR=arv@chromium.org

Review URL: https://codereview.chromium.org/11014009

TBR=aa@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159655 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 41 insertions, 42 deletions

diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 6ff6b01..e076ba1 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -124,66 +124,65 @@ TEST_F(ComponentLoaderTest, ParseManifest) {
   // Test invalid JSON.
   manifest.reset(
       component_loader_.ParseManifest("{ 'test': 3 } invalid"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   // Test manifests that are valid JSON, but don't have an object literal
   // at the root. ParseManifest() should always return NULL.
 
   manifest.reset(component_loader_.ParseManifest(""));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("[{ \"foo\": 3 }]"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("\"Test\""));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("42"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("true"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("false"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   manifest.reset(component_loader_.ParseManifest("null"));
-  EXPECT_FALSE(manifest.get());
+  ASSERT_EQ((DictionaryValue*)NULL, manifest.get());
 
   // Test parsing valid JSON.
 
-  int value = 0;
+  int value;
   manifest.reset(component_loader_.ParseManifest(
       "{ \"test\": { \"one\": 1 }, \"two\": 2 }"));
-  ASSERT_TRUE(manifest.get());
-  EXPECT_TRUE(manifest->GetInteger("test.one", &value));
-  EXPECT_EQ(1, value);
+  ASSERT_NE(manifest.get(), (DictionaryValue*)NULL);
+  ASSERT_TRUE(manifest->GetInteger("test.one", &value));
+  ASSERT_EQ(1, value);
   ASSERT_TRUE(manifest->GetInteger("two", &value));
-  EXPECT_EQ(2, value);
+  ASSERT_EQ(2, value);
 
   std::string string_value;
   manifest.reset(component_loader_.ParseManifest(manifest_contents_));
   ASSERT_TRUE(manifest->GetString("background.page", &string_value));
-  EXPECT_EQ("backgroundpage.html", 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);
-  std::string extension_id =
-      component_loader_.Add(manifest_contents_, extension_path_);
-  EXPECT_NE("", extension_id);
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  extension = component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_EQ((Extension*)NULL, extension.get());
+  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);
-  std::string extension_id =
-      component_loader_.Add(manifest_contents_, extension_path_);
-  EXPECT_NE("", extension_id);
-  EXPECT_EQ(1u, extension_service_.extensions()->size());
-  EXPECT_TRUE(extension_service_.extensions()->GetByID(extension_id));
+  extension = component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_NE((Extension*)NULL, extension.get());
+  ASSERT_EQ(1u, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, Remove) {
@@ -191,25 +190,25 @@ TEST_F(ComponentLoaderTest, Remove) {
 
   // Removing an extension that was never added should be ok.
   component_loader_.Remove(extension_path_);
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  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();
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  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);
-  std::string extension_id =
-      component_loader_.Add(manifest_contents_, extension_path_);
-  EXPECT_EQ(1u, extension_service_.extensions()->size());
+  extension = component_loader_.Add(manifest_contents_, extension_path_);
+  ASSERT_NE((Extension*)NULL, extension.get());
   component_loader_.Remove(extension_path_);
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  ASSERT_EQ(0u, extension_service_.extensions()->size());
 
   // And after calling LoadAll(), it shouldn't get loaded.
   component_loader_.LoadAll();
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  ASSERT_EQ(0u, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, LoadAll) {
@@ -217,7 +216,7 @@ TEST_F(ComponentLoaderTest, LoadAll) {
 
   // No extensions should be loaded if none were added.
   component_loader_.LoadAll();
-  EXPECT_EQ(0u, extension_service_.extensions()->size());
+  ASSERT_EQ(0u, extension_service_.extensions()->size());
 
   // Use LoadAll() to load the default extensions.
   component_loader_.AddDefaultComponentExtensions();
@@ -229,7 +228,7 @@ TEST_F(ComponentLoaderTest, LoadAll) {
   component_loader_.Add(manifest_contents_, extension_path_);
   component_loader_.LoadAll();
 
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
@@ -241,7 +240,7 @@ TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
   extension_service_.set_ready(true);
   prefs_.SetUserPref(prefs::kEnterpriseWebStoreURL,
                      Value::CreateStringValue("http://www.google.com"));
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
 
   // Now that the pref is set, check if it's added by default.
   extension_service_.set_ready(false);
@@ -249,16 +248,16 @@ TEST_F(ComponentLoaderTest, EnterpriseWebStore) {
   component_loader_.ClearAllRegistered();
   component_loader_.AddDefaultComponentExtensions();
   component_loader_.LoadAll();
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
 
   // Number of loaded extensions should be the same after changing the pref.
   prefs_.SetUserPref(prefs::kEnterpriseWebStoreURL,
                      Value::CreateStringValue("http://www.google.de"));
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
+  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
 }
 
 TEST_F(ComponentLoaderTest, AddOrReplace) {
-  EXPECT_EQ(0u, component_loader_.registered_extensions_count());
+  ASSERT_EQ(0u, component_loader_.registered_extensions_count());
   component_loader_.AddDefaultComponentExtensions();
   size_t const default_count = component_loader_.registered_extensions_count();
   FilePath known_extension = GetBasePath()
@@ -267,24 +266,24 @@ TEST_F(ComponentLoaderTest, AddOrReplace) {
 
   // Replace a default component extension.
   component_loader_.AddOrReplace(known_extension);
-  EXPECT_EQ(default_count,
+  ASSERT_EQ(default_count,
             component_loader_.registered_extensions_count());
 
   // Add a new component extension.
   component_loader_.AddOrReplace(unknow_extension);
-  EXPECT_EQ(default_count + 1,
+  ASSERT_EQ(default_count + 1,
             component_loader_.registered_extensions_count());
 
   extension_service_.set_ready(true);
   component_loader_.LoadAll();
 
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
-  EXPECT_EQ(0u, extension_service_.unloaded_count());
+  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);
-  EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
-  EXPECT_EQ(1u, extension_service_.unloaded_count());
+  ASSERT_EQ(default_count + 1, extension_service_.extensions()->size());
+  ASSERT_EQ(1u, extension_service_.unloaded_count());
 }
 
 }  // namespace extensions