Revert 284725 "Use ExtensionRegistryObserver instead of DEPRECAT..."

trunk/src/chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
@@ skipping 19 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/test/net/url_request_mock_http_job.h"
-#include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 
 using content::WebContents;
 
 class PanelBrowserTest : public BasePanelBrowserTest {
@@ skipping 1361 matching lines @@
   Panel* panel_other = CreatePanel(extension_app_name_other);
 
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CLOSED,
       content::Source<Panel>(panel));
   content::WindowedNotificationObserver signal1(
       chrome::NOTIFICATION_PANEL_CLOSED,
       content::Source<Panel>(panel1));
 
   // Send unload notification on the first extension.
-  extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(browser()->profile());
-  registry->RemoveEnabled(extension->id());
-  registry->TriggerOnUnloaded(
-                extension.get(),
-                extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+  extensions::UnloadedExtensionInfo details(
+      extension.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+      content::Source<Profile>(browser()->profile()),
+      content::Details<extensions::UnloadedExtensionInfo>(&details));
 
   // Wait for the panels opened by the first extension to close.
   signal.Wait();
   signal1.Wait();
 
   // Verify that the panel that's left is the panel from the second extension.
   EXPECT_EQ(panel_other, panel_manager->panels()[0]);
   panel_other->Close();
 }
 
@@ skipping 336 matching lines @@
 #else
 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize
 #endif
 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
                        MAYBE_FocusChangeEventOnMinimize) {
   // This is needed so the subsequently created panels can be activated.
   // On a Mac, it transforms background-only test process into foreground one.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
 }