Pull browser action click logic into ToolbarModelController, so that when I

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2012 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_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 463 matching lines @@
 
 void ExtensionService::InitEventRouters() {
   if (event_routers_initialized_)
     return;
 
 #if defined(ENABLE_EXTENSIONS)
   downloads_event_router_.reset(new ExtensionDownloadsEventRouter(profile_));
   history_event_router_.reset(new HistoryExtensionEventRouter());
   history_event_router_->ObserveProfile(profile_);
   browser_event_router_.reset(new ExtensionBrowserEventRouter(profile_));
-  browser_event_router_->Init(&toolbar_model_);
+  browser_event_router_->Init();
   preference_event_router_.reset(new ExtensionPreferenceEventRouter(profile_));
   bookmark_event_router_.reset(new BookmarkExtensionEventRouter(
       profile_->GetBookmarkModel()));
   bookmark_event_router_->Init();
   cookies_event_router_.reset(new
       extensions::ExtensionCookiesEventRouter(profile_));
   cookies_event_router_->Init();
   management_event_router_.reset(new ExtensionManagementEventRouter(profile_));
   management_event_router_->Init();
   ExtensionProcessesEventRouter::GetInstance()->ObserveProfile(profile_);
@@ skipping 2062 matching lines @@
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy an
   // APIResourceController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!api_resource_controller_) {
     api_resource_controller_ = new extensions::APIResourceController();
   }
   return api_resource_controller_;
 }