Revert 113047 - Make ExtensionService use ExtensionSet.

chrome/browser/extensions/browser_action_apitest.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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 298 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoDragging) {
   ExtensionService* service = browser()->profile()->GetExtensionService();
 
   // The tooltips for each respective browser action.
   const char kTooltipA[] = "Make this page red";
   const char kTooltipB[] = "grow";
   const char kTooltipC[] = "Test setPopup()";
 
   const size_t size_before = service->extensions()->size();
 
-  const Extension* extension_a = LoadExtension(test_data_dir_.AppendASCII(
-      "browser_action/basics"));
-  const Extension* extension_b = LoadExtension(test_data_dir_.AppendASCII(
-      "browser_action/popup"));
-  const Extension* extension_c = LoadExtension(test_data_dir_.AppendASCII(
-      "browser_action/add_popup"));
-  ASSERT_TRUE(extension_a);
-  ASSERT_TRUE(extension_b);
-  ASSERT_TRUE(extension_c);
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
+      "browser_action/basics")));
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
+      "browser_action/popup")));
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
+      "browser_action/add_popup")));
 
   // Test that there are 3 browser actions in the toolbar.
   ASSERT_EQ(size_before + 3, service->extensions()->size());
   ASSERT_EQ(3, GetBrowserActionsBar().NumberOfBrowserActions());
 
   // Now enable 2 of the extensions in incognito mode, and test that the browser
   // actions show up.
-  service->extension_prefs()->SetIsIncognitoEnabled(extension_a->id(), true);
-  service->extension_prefs()->SetIsIncognitoEnabled(extension_c->id(), true);
+  service->extension_prefs()->SetIsIncognitoEnabled(
+      service->extensions()->at(size_before)->id(), true);
+  service->extension_prefs()->SetIsIncognitoEnabled(
+      service->extensions()->at(size_before + 2)->id(), true);
 
   Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile();
   Browser* incognito_browser = Browser::Create(incognito_profile);
   BrowserActionTestUtil incognito_bar(incognito_browser);
 
   // Navigate just to have a tab in this window, otherwise wonky things happen.
   ui_test_utils::OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   ASSERT_EQ(2, incognito_bar.NumberOfBrowserActions());
 
   // Ensure that the browser actions are in the right order (ABC).
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1));
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(2));
 
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(0));
   EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(1));
 
   // Now rearrange them and ensure that they are rearranged correctly in both
   // regular and incognito mode.
 
   // ABC -> CAB
-  service->toolbar_model()->MoveBrowserAction(extension_c, 0);
+  service->toolbar_model()->MoveBrowserAction(
+      service->extensions()->at(size_before + 2), 0);
 
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(1));
   EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(2));
 
   EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0));
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
 
   // CAB -> CBA
-  service->toolbar_model()->MoveBrowserAction(extension_b, 1);
+  service->toolbar_model()->MoveBrowserAction(
+      service->extensions()->at(size_before + 1), 1);
 
   EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
   EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1));
   EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(2));
 
   EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0));
   EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
 }
 
 // Disabled because of failures (crashes) on ASAN bot.
@@ skipping 19 matching lines @@
       BrowserActionExecuted(
           browser()->profile(), action->extension_id(), browser());
 
   // It can take a moment for the background page to actually get destroyed
   // so we wait for the notification before checking that it's really gone
   // and the badge text has been set.
   host_destroyed_observer.Wait();
   ASSERT_FALSE(manager->GetBackgroundHostForExtension(extension->id()));
   ASSERT_EQ("X", action->GetBadgeText(ExtensionAction::kDefaultTabId));
 }