Move yet more from WmShell to Shell

ash/common/test/test_shelf_delegate.cc

 // Copyright 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 "ash/common/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 57 matching lines @@
   ShelfID shelf_id = window->aura_window()->GetProperty(kShelfIDKey);
   AddShelfIDToAppIDMapping(shelf_id, app_id);
 }
 
 void TestShelfDelegate::AddShelfItem(WmWindow* window, ShelfItemStatus status) {
   ShelfItem item;
   if (window->GetType() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
     item.type = TYPE_APP;
-  ShelfModel* model = WmShell::Get()->shelf_model();
+  ShelfModel* model = Shell::Get()->shelf_model();
   ShelfID id = model->next_id();
   item.status = status;
   model->Add(item);
   window->aura_window()->AddObserver(this);
 
   model->SetShelfItemDelegate(id,
                               base::MakeUnique<TestShelfItemDelegate>(window));
   window->aura_window()->SetProperty(kShelfIDKey, id);
 }
 
 void TestShelfDelegate::RemoveShelfItemForWindow(WmWindow* window) {
   ShelfID shelf_id = window->aura_window()->GetProperty(kShelfIDKey);
   if (shelf_id == 0)
     return;
-  ShelfModel* model = WmShell::Get()->shelf_model();
+  ShelfModel* model = Shell::Get()->shelf_model();
   int index = model->ItemIndexByID(shelf_id);
   DCHECK_NE(-1, index);
   model->RemoveItemAt(index);
   window->aura_window()->RemoveObserver(this);
   if (HasShelfIDToAppIDMapping(shelf_id)) {
     const std::string& app_id = GetAppIDForShelfID(shelf_id);
     if (IsAppPinned(app_id))
       UnpinAppWithID(app_id);
     if (HasShelfIDToAppIDMapping(shelf_id))
       RemoveShelfIDToAppIDMapping(shelf_id);
@@ skipping 52 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash