Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/extensions/extension_toolbar_model_browsertest.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/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"
 #include "chrome/test/base/in_process_browser_test.h"
 
 using extensions::Extension;
 
 // An InProcessBrowserTest for testing the ExtensionToolbarModel.
 // TODO(erikkay) It's unfortunate that this needs to be an in-proc browser test.
 // It would be nice to refactor things so that ExtensionService could run
 // without so much of the browser in place.
 class ExtensionToolbarModelTest : public ExtensionBrowserTest,
                                   public ExtensionToolbarModel::Observer {
  public:
   virtual void SetUp() {
     inserted_count_ = 0;
     removed_count_ = 0;
     moved_count_ = 0;
 
     ExtensionBrowserTest::SetUp();
   }
 
   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);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     model_->RemoveObserver(this);
   }
 
   virtual void BrowserActionAdded(const Extension* extension,
                                   int index) OVERRIDE {
     inserted_count_++;
@@ skipping 326 matching lines @@
   new_order.push_back(id_c);
   new_order.push_back(id_b);
   extensions::ExtensionPrefs::Get(browser()->profile())->SetToolbarOrder(
       new_order);
 
   // Verify order is changed.
   EXPECT_EQ(id_c, ExtensionAt(0)->id());
   EXPECT_EQ(id_b, ExtensionAt(1)->id());
   EXPECT_EQ(id_a, ExtensionAt(2)->id());
 }