Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/extensions/extension_toolbar_model_browsertest.cc

Index: chrome/browser/extensions/extension_toolbar_model_browsertest.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index 4b3d7346fda1fbeb71b0cb40e6b38d7cc1fa3570..6936213686214191904ee8917a2e96e6e9ca8518 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_browsertest.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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -28,9 +26,7 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest,
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    ExtensionService* service = extensions::ExtensionSystem::Get(
-        browser()->profile())->extension_service();
-    model_ = service->toolbar_model();
+    model_ = ExtensionToolbarModel::Get(browser()->profile());
     model_->AddObserver(this);
   }