Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/prefs/pref_service.h"
@@ skipping 264 matching lines @@
 
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
     profile_ = browser->profile();
 
     observer_.reset(new ExtensionServiceObserverBridge(self, browser_));
-    ExtensionService* extensionService =
-        extensions::ExtensionSystem::Get(profile_)->extension_service();
-    // |extensionService| can be NULL in Incognito.
-    if (extensionService) {
-      toolbarModel_ = extensionService->toolbar_model();
+    toolbarModel_ = ExtensionToolbarModel::Get(profile_);
+    if (toolbarModel_)
       toolbarModel_->AddObserver(observer_.get());
-    }
 
     containerView_ = container;
     [containerView_ setPostsFrameChangedNotifications:YES];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(containerFrameChanged:)
                name:NSViewFrameDidChangeNotification
              object:containerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
@@ skipping 585 matching lines @@
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
     const Extension* extension = toolbar_items[index].get();
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end