Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
+#include <algorithm>
 #include <string>
+#include <vector>
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1489 matching lines @@
       event_box_.get(),
       devtools);
   return true;
 }
 
 gboolean LocationBarViewGtk::PageActionViewGtk::OnButtonPressed(
     GtkWidget* sender,
     GdkEvent* event) {
   if (event->button.button != 3) {
     if (!ShowPopup(false)) {
-      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(),
           event->button.button);
     }
   } else {
     const Extension* extension = profile_->GetExtensionService()->
         GetExtensionById(page_action()->extension_id(), false);
@@ skipping 20 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasSkiaPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }