Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 6f3fc61534a9b44687de095107ec0fd2ef75e325..10619fd4585e05a956ffed96567e4203367d7703 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -1874,7 +1874,7 @@ TEST_F(ExtensionServiceTest, UpdateApps) {
 TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
   InitializeEmptyExtensionService();
   InitializeRequestContext();
-  EXPECT_TRUE(service_->extensions()->empty());
+  EXPECT_TRUE(service_->extensions()->is_empty());
 
   int pref_count = 0;
 
@@ -1925,7 +1925,7 @@ TEST_F(ExtensionServiceTest, InstallAppsWithUnlimitedStorage) {
 TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) {
   InitializeEmptyExtensionService();
   InitializeRequestContext();
-  EXPECT_TRUE(service_->extensions()->empty());
+  EXPECT_TRUE(service_->extensions()->is_empty());
 
   int pref_count = 0;
 
@@ -1954,7 +1954,7 @@ TEST_F(ExtensionServiceTest, InstallAppsAndCheckStorageProtection) {
 
   UninstallExtension(id2, false);
 
-  EXPECT_TRUE(service_->extensions()->empty());
+  EXPECT_TRUE(service_->extensions()->is_empty());
   EXPECT_FALSE(profile_->GetExtensionSpecialStoragePolicy()->
       IsStorageProtected(origin1));
   EXPECT_FALSE(profile_->GetExtensionSpecialStoragePolicy()->
@@ -2675,18 +2675,18 @@ TEST_F(ExtensionServiceTest, DisableExtension) {
   InitializeEmptyExtensionService();
 
   InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
-  EXPECT_FALSE(service_->extensions()->empty());
+  EXPECT_FALSE(service_->extensions()->is_empty());
   EXPECT_TRUE(service_->GetExtensionById(good_crx, true));
   EXPECT_TRUE(service_->GetExtensionById(good_crx, false));
-  EXPECT_TRUE(service_->disabled_extensions()->empty());
+  EXPECT_TRUE(service_->disabled_extensions()->is_empty());
 
   // Disable it.
   service_->DisableExtension(good_crx);
 
-  EXPECT_TRUE(service_->extensions()->empty());
+  EXPECT_TRUE(service_->extensions()->is_empty());
   EXPECT_TRUE(service_->GetExtensionById(good_crx, true));
   EXPECT_FALSE(service_->GetExtensionById(good_crx, false));
-  EXPECT_FALSE(service_->disabled_extensions()->empty());
+  EXPECT_FALSE(service_->disabled_extensions()->is_empty());
 }
 
 TEST_F(ExtensionServiceTest, DisableTerminatedExtension) {
@@ -2701,7 +2701,7 @@ TEST_F(ExtensionServiceTest, DisableTerminatedExtension) {
 
   EXPECT_FALSE(service_->GetTerminatedExtension(good_crx));
   EXPECT_TRUE(service_->GetExtensionById(good_crx, true));
-  EXPECT_FALSE(service_->disabled_extensions()->empty());
+  EXPECT_FALSE(service_->disabled_extensions()->is_empty());
 }
 
 // Tests disabling all extensions (simulating --disable-extensions flag).