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 40 matching lines @@
   // of settings browsers (which will not be valid during chrome::Navigate
   // which is why we still need the above test).
   if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(browser))
     return true;
   return false;
 }
 
 }  // namespace
 
 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController(
-    ChromeLauncherController* launcher_controller)
+    ChromeLauncherController* launcher_controller,
+    ash::ShelfModel* shelf_model)
     : LauncherItemController(TYPE_SHORTCUT,
                              extension_misc::kChromeAppId,
-                             launcher_controller) {
-}
+                             launcher_controller),
+      shelf_model_(shelf_model) {}
 
 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();
-
   // Determine the new browser's active state and change if necessary.
-  int browser_index = model->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
+  int browser_index =
+      shelf_model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
   DCHECK_GE(browser_index, 0);
-  ash::ShelfItem browser_item = model->items()[browser_index];
+  ash::ShelfItem browser_item = shelf_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,
     // a windowed app, a popup or any other item which is not a browser of
     // interest.
     Browser* browser = chrome::FindBrowserWithWindow(window);
     if (IsBrowserRepresentedInBrowserList(browser)) {
       browser_status = ash::STATUS_ACTIVE;
@@ skipping 15 matching lines @@
          it != browser_list->end_last_active() &&
          browser_status == ash::STATUS_CLOSED;
          ++it) {
       if (IsBrowserRepresentedInBrowserList(*it))
         browser_status = ash::STATUS_RUNNING;
     }
   }
 
   if (browser_status != browser_item.status) {
     browser_item.status = browser_status;
-    model->Set(browser_index, browser_item);
+    shelf_model_->Set(browser_index, browser_item);
   }
 }
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   // We need to call SetShelfIDForWindow for V1 applications since they are
   // content which might change and as such change the application type.
   if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser) ||
       IsSettingsBrowser(browser))
@@ skipping 236 matching lines @@
         !browser->window()->IsMinimized()) {
       continue;
     }
     if (!IsBrowserRepresentedInBrowserList(browser) &&
         !browser->is_type_tabbed())
       continue;
     active_browsers.push_back(browser);
   }
   return active_browsers;
 }