Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/extensions/page_action_apitest.cc

 // Copyright (c) 2010 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/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 22 matching lines @@
       browser()->GetSelectedTabContents()->controller().session_id().id();
   ExtensionAction* action = extension->page_action();
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
 
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
     int tab_id =
         ExtensionTabUtil::GetTabId(browser()->GetSelectedTabContents());
-    ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
+    ExtensionService* service = browser()->profile()->GetExtensionService();
+    service->browser_event_router()->PageActionExecuted(
         browser()->profile(), extension->id(), "", tab_id, "", 0);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   {
     // Tell the extension to update the page action state again.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update2.html")));
     ASSERT_TRUE(catcher.GetNextResult());
@@ skipping 16 matching lines @@
   ExtensionAction* page_action = extension->page_action();
   ASSERT_TRUE(page_action)
       << "Page action test extension should have a page action.";
 
   ASSERT_FALSE(page_action->HasPopup(tab_id));
 
   // Simulate the page action being clicked.  The resulting event should
   // install a page action popup.
   {
     ResultCatcher catcher;
-    ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
+    ExtensionService* service = browser()->profile()->GetExtensionService();
+    service->browser_event_router()->PageActionExecuted(
         browser()->profile(), extension->id(), "action", tab_id, "", 1);
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   ASSERT_TRUE(page_action->HasPopup(tab_id))
       << "Clicking on the page action should have caused a popup to be added.";
 
   ASSERT_STREQ("/a_popup.html",
                page_action->GetPopupUrl(tab_id).path().c_str());
 
@@ skipping 54 matching lines @@
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("page.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // Simulate the page action being clicked.
   {
     ResultCatcher catcher;
     int tab_id =
         ExtensionTabUtil::GetTabId(browser()->GetSelectedTabContents());
-    ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
+    ExtensionService* service = browser()->profile()->GetExtensionService();
+    service->browser_event_router()->PageActionExecuted(
         browser()->profile(), extension->id(), "action", tab_id, "", 1);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 }
 
 // Tests popups in page actions.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ShowPageActionPopup) {
   ASSERT_TRUE(RunExtensionTest("page_action/popup")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
@@ skipping 14 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TestCrash57333) {
   // Load extension A.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")
                                           .AppendASCII("crash_57333")
                                           .AppendASCII("Extension1")));
   // Load extension B.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("page_action")
                                           .AppendASCII("crash_57333")
                                           .AppendASCII("Extension2")));
 }