Count blacklisting as an extension being disabled. Correctly.

chrome/browser/extensions/extension_service_unittest.cc

 // Copyright (c) 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 "chrome/browser/extensions/extension_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 3435 matching lines @@
   extensions::TestBlacklist test_blacklist;
 
   InitializeGoodInstalledExtensionService();
   test_blacklist.Attach(service_->blacklist_);
   ExtensionPrefs::Get(profile_.get())->SetExtensionBlacklisted(good0, true);
   ExtensionPrefs::Get(profile_.get())->SetExtensionBlacklisted(good1, true);
 
   test_blacklist.SetBlacklistState(
       good1, extensions::BLACKLISTED_MALWARE, false);
 
+  // Extension service hasn't loaded yet, but IsExtensionEnabled reads out of
+  // prefs. Ensure it takes into account the blacklist state (crbug.com/373842).
+  EXPECT_FALSE(service_->IsExtensionEnabled(good0));
+  EXPECT_FALSE(service_->IsExtensionEnabled(good1));
+  EXPECT_TRUE(service_->IsExtensionEnabled(good2));
+
   service_->Init();
 
-  ASSERT_EQ(2u, registry_->blacklisted_extensions().size());
-  ASSERT_EQ(1u, registry_->enabled_extensions().size());
+  EXPECT_EQ(2u, registry_->blacklisted_extensions().size());
+  EXPECT_EQ(1u, registry_->enabled_extensions().size());
 
-  ASSERT_TRUE(registry_->blacklisted_extensions().Contains(good0));
-  ASSERT_TRUE(registry_->blacklisted_extensions().Contains(good1));
-  ASSERT_TRUE(registry_->enabled_extensions().Contains(good2));
+  EXPECT_TRUE(registry_->blacklisted_extensions().Contains(good0));
+  EXPECT_TRUE(registry_->blacklisted_extensions().Contains(good1));
+  EXPECT_TRUE(registry_->enabled_extensions().Contains(good2));
 
   // Give time for the blacklist to update.
   base::RunLoop().RunUntilIdle();
 
-  ASSERT_EQ(1u, registry_->blacklisted_extensions().size());
-  ASSERT_EQ(2u, registry_->enabled_extensions().size());
+  EXPECT_EQ(1u, registry_->blacklisted_extensions().size());
+  EXPECT_EQ(2u, registry_->enabled_extensions().size());
 
-  ASSERT_TRUE(registry_->enabled_extensions().Contains(good0));
-  ASSERT_TRUE(registry_->blacklisted_extensions().Contains(good1));
-  ASSERT_TRUE(registry_->enabled_extensions().Contains(good2));
+  EXPECT_TRUE(registry_->enabled_extensions().Contains(good0));
+  EXPECT_TRUE(registry_->blacklisted_extensions().Contains(good1));
+  EXPECT_TRUE(registry_->enabled_extensions().Contains(good2));
 }
 #endif  // defined(ENABLE_BLACKLIST_TESTS)
 
 #if defined(ENABLE_BLACKLIST_TESTS)
 // Extension is added to blacklist with BLACKLISTED_POTENTIALLY_UNWANTED state
 // after it is installed. It is then successfully re-enabled by the user.
 TEST_F(ExtensionServiceTest, GreylistedExtensionDisabled) {
   extensions::TestBlacklist test_blacklist;
   // A profile with 3 extensions installed: good0, good1, and good2.
   InitializeGoodInstalledExtensionService();
@@ skipping 3493 matching lines @@
 
   service_->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
                     content::Source<Profile>(profile_.get()),
                     content::NotificationService::NoDetails());
   EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
   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());
 }