Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/ui/views/location_bar/page_action_image_view.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/ui/views/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 80 matching lines @@
         browser,
         browser->profile(),
         browser->window()->GetNativeHandle(),
         screen_bounds,
         arrow_location,
         true,  // Activate the popup window.
         inspect_with_devtools,
         ExtensionPopup::BUBBLE_CHROME,
         this);  // ExtensionPopup::Observer
   } else {
-    ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
+    ExtensionService* service = profile_->GetExtensionService();
+    service->browser_event_router()->PageActionExecuted(
         profile_, page_action_->extension_id(), page_action_->id(),
         current_tab_id_, current_url_.spec(), button);
   }
 }
 
 AccessibilityTypes::Role PageActionImageView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 bool PageActionImageView::OnMousePressed(const views::MouseEvent& event) {
@@ skipping 125 matching lines @@
 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
   DCHECK_EQ(popup_, popup);
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   popup_ = NULL;
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->Close();
 }