Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/extension_management_browsertest.cc

Index: chrome/browser/extensions/extension_management_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_management_browsertest.cc	(revision 113231)
+++ chrome/browser/extensions/extension_management_browsertest.cc	(working copy)
@@ -314,7 +314,7 @@
   ExtensionTestMessageListener listener1("v1 installed", false);
   ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->empty());
+  ASSERT_TRUE(service->disabled_extensions()->is_empty());
   const Extension* extension =
       InstallExtension(basedir.AppendASCII("v1.crx"), 1);
   ASSERT_TRUE(extension);
@@ -382,7 +382,7 @@
                                      basedir.AppendASCII("v2.crx"));
 
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->empty());
+  ASSERT_TRUE(service->disabled_extensions()->is_empty());
 
   PendingExtensionManager* pending_extension_manager =
       service->pending_extension_manager();
@@ -465,7 +465,7 @@
                                      basedir.AppendASCII("v2.crx"));
 
   const size_t size_before = service->extensions()->size();
-  ASSERT_TRUE(service->disabled_extensions()->empty());
+  ASSERT_TRUE(service->disabled_extensions()->is_empty());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   const ListValue* forcelist =
@@ -520,7 +520,7 @@
   service->updater()->set_blacklist_checks_enabled(false);
   const size_t size_before = service->extensions()->size();
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
-  ASSERT_TRUE(service->disabled_extensions()->empty());
+  ASSERT_TRUE(service->disabled_extensions()->is_empty());
 
   // Note: This interceptor gets requests on the IO thread.
   scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
@@ -581,7 +581,7 @@
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::INTERNAL, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
-  EXPECT_TRUE(service->disabled_extensions()->empty());
+  EXPECT_TRUE(service->disabled_extensions()->is_empty());
 
   service->DisableExtension(kExtensionId);
   EXPECT_EQ(1u, service->disabled_extensions()->size());
@@ -604,5 +604,5 @@
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
-  EXPECT_TRUE(service->disabled_extensions()->empty());
+  EXPECT_TRUE(service->disabled_extensions()->is_empty());
 }