Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/ui/views/browser_actions_container_browsertest.cc

Index: chrome/browser/ui/views/browser_actions_container_browsertest.cc
===================================================================
--- chrome/browser/ui/views/browser_actions_container_browsertest.cc	(revision 113231)
+++ chrome/browser/ui/views/browser_actions_container_browsertest.cc	(working copy)
@@ -242,18 +242,15 @@
 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
   LOG(INFO) << "Test starting\n" << std::flush;
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
-  const size_t size_before = service->extensions()->size();
-
   LOG(INFO) << "Loading extension\n" << std::flush;
 
   // Load extension A (contains browser action).
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
-                                          .AppendASCII("browser_action")
-                                          .AppendASCII("crash_57536")));
+  const Extension* extension = LoadExtension(
+      test_data_dir_.AppendASCII("api_test")
+      .AppendASCII("browser_action")
+      .AppendASCII("crash_57536"));
+  ASSERT_TRUE(extension);
 
-  const Extension* extension = service->extensions()->at(size_before);
-
   LOG(INFO) << "Creating bitmap\n" << std::flush;
 
   // Create and cache and empty bitmap.