Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/extensions/active_tab_apitest.cc

Index: chrome/browser/extensions/active_tab_apitest.cc
diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc
index 1ec7e32c059512d7a95b61ce3a236248419feee4..370b516c4b7ba87a02312853f2cc673f50d00e00 100644
--- a/chrome/browser/extensions/active_tab_apitest.cc
+++ b/chrome/browser/extensions/active_tab_apitest.cc
@@ -4,8 +4,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -27,8 +26,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ActiveTab) {
       LoadExtension(test_data_dir_.AppendASCII("active_tab"));
   ASSERT_TRUE(extension);
 
-  ExtensionService* service =
-      ExtensionSystem::Get(browser()->profile())->extension_service();
+  ExtensionToolbarModel* toolbar_model =
+      ExtensionToolbarModel::Get(browser()->profile());
 
   // Shouldn't be initially granted based on activeTab.
   {
@@ -43,8 +42,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ActiveTab) {
   // Granting to the extension should give it access to page.html.
   {
     ResultCatcher catcher;
-    service->toolbar_model()->ExecuteBrowserAction(
-        extension, browser(), NULL, true);
+    toolbar_model->ExecuteBrowserAction(extension, browser(), NULL, true);
     EXPECT_TRUE(catcher.GetNextResult()) << message_;
   }