Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/ui/views/browser_actions_container.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/views/browser_actions_container.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 466 matching lines @@
 }
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
     BrowserActionButton* button,
     bool inspect_with_devtools) {
   ExtensionAction* browser_action = button->browser_action();
 
   // Popups just display.  No notification to the extension.
   // TODO(erikkay): should there be?
   if (!button->IsPopup()) {
-    ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
+    ExtensionService* service = profile_->GetExtensionService();
+    service->browser_event_router()->BrowserActionExecuted(
         profile_, browser_action->extension_id(), browser_);
     return;
   }
 
   // If we're showing the same popup, just hide it and return.
   bool same_showing = popup_ && button == popup_button_;
 
   // Always hide the current popup, even if it's not the same.
   // Only one popup should be visible at a time.
   HidePopup();
@@ skipping 596 matching lines @@
     AnimationEnded(resize_animation_.get());
   }
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
     const Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionService()->IsIncognitoEnabled(extension));
 }