Getting rid of ChromeLauncherController::model().

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 2013 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/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 56 matching lines @@
 BrowserShortcutLauncherItemController::
     ~BrowserShortcutLauncherItemController() {
 }
 
 void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
   // The shell will not be available for win7_aura unittests like
   // ChromeLauncherControllerTest.BrowserMenuGeneration.
   if (!ash::Shell::HasInstance())
     return;
 
-  ash::ShelfModel* model = launcher_controller()->model();
+  ash::ShelfModel* model = ash::Shell::GetInstance()->shelf_model();
 
   // Determine the new browser's active state and change if necessary.
   int browser_index = model->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
   DCHECK_GE(browser_index, 0);
   ash::ShelfItem browser_item = model->items()[browser_index];
   ash::ShelfItemStatus browser_status = ash::STATUS_CLOSED;
 
   aura::Window* window = ash::wm::GetActiveWindow();
   if (window) {
     // Check if the active browser / tab is a browser which is not an app,
@@ skipping 277 matching lines @@
         !browser->window()->IsMinimized()) {
       continue;
     }
     if (!IsBrowserRepresentedInBrowserList(browser) &&
         !browser->is_type_tabbed())
       continue;
     active_browsers.push_back(browser);
   }
   return active_browsers;
 }