Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/extensions/browser_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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 52 matching lines @@
   ExtensionAction* action = extension->browser_action();
   ASSERT_EQ("Modified", action->GetTitle(ExtensionAction::kDefaultTabId));
   ASSERT_EQ("badge", action->GetBadgeText(ExtensionAction::kDefaultTabId));
   ASSERT_EQ(SkColorSetARGB(255, 255, 255, 255),
             action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
 
   // Simulate the browser action being clicked.
   ui_test_utils::NavigateToURL(browser(),
       test_server()->GetURL("files/extensions/test_file.txt"));
 
-  ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
+  ExtensionService* service = browser()->profile()->GetExtensionService();
+  service->browser_event_router()->BrowserActionExecuted(
       browser()->profile(), action->extension_id(), browser());
 
   // Verify the command worked.
   TabContents* tab = browser()->GetSelectedTabContents();
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       tab->render_view_host(), L"",
       L"setInterval(function(){"
       L"  if(document.body.bgColor == 'red'){"
       L"    window.domAutomationController.send(true)}}, 100)",
@@ skipping 278 matching lines @@
   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));
 }