Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/ui/views/browser_actions_container_browsertest.cc

 // Copyright (c) 2011 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/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
@@ skipping 224 matching lines @@
 
   ReloadExtension(idA);
 
   // The browser action should become visible again.
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
 }
 
 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).
-  const Extension* extension = LoadExtension(
-      test_data_dir_.AppendASCII("api_test")
-      .AppendASCII("browser_action")
-      .AppendASCII("crash_57536"));
-  ASSERT_TRUE(extension);
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
+                                          .AppendASCII("browser_action")
+                                          .AppendASCII("crash_57536")));
+
+  const Extension* extension = service->extensions()->at(size_before);
 
   LOG(INFO) << "Creating bitmap\n" << std::flush;
 
   // Create and cache and empty bitmap.
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                     Extension::kBrowserActionIconMaxSize,
                     Extension::kBrowserActionIconMaxSize);
   bitmap.allocPixels();
 
   LOG(INFO) << "Set as cached image\n" << std::flush;
 
   gfx::Size size(Extension::kBrowserActionIconMaxSize,
                  Extension::kBrowserActionIconMaxSize);
   extension->SetCachedImage(
       extension->GetResource(extension->browser_action()->default_icon_path()),
       bitmap,
       size);
 
   LOG(INFO) << "Disabling extension\n" << std::flush;
   DisableExtension(extension->id());
   LOG(INFO) << "Enabling extension\n" << std::flush;
   EnableExtension(extension->id());
   LOG(INFO) << "Test ending\n" << std::flush;
 }