Move yet more from WmShell to Shell

ash/metrics/user_metrics_recorder.cc

Index: ash/metrics/user_metrics_recorder.cc
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index 5dcbc08a57dcff6705971b25af0c62304ade4782..3af9f7eaa055b7aaaf01469f2f5913cc6f5d2a04 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -169,13 +169,13 @@ int GetNumVisibleWindowsInPrimaryDisplay() {
 
 // Records the number of items in the shelf as an UMA statistic.
 void RecordShelfItemCounts() {
-  ShelfDelegate* shelf_delegate = WmShell::Get()->shelf_delegate();
+  ShelfDelegate* shelf_delegate = Shell::Get()->shelf_delegate();
   DCHECK(shelf_delegate);
 
   int pinned_item_count = 0;
   int unpinned_item_count = 0;
 
-  for (const ShelfItem& shelf_item : WmShell::Get()->shelf_model()->items()) {
+  for (const ShelfItem& shelf_item : Shell::Get()->shelf_model()->items()) {
     if (shelf_item.type != TYPE_APP_LIST) {
       // Internal ash apps do not have an app id and thus will always be counted
       // as unpinned.