Move yet more from WmShell to Shell

ash/metrics/user_metrics_recorder.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/metrics/user_metrics_recorder.h"
 
 #include "ash/common/metrics/pointer_metrics_recorder.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
@@ skipping 151 matching lines @@
         maximized_or_fullscreen_window_present = true;
         break;
       }
     }
   }
   return visible_window_count;
 }
 
 // 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.
       if (shelf_delegate->HasShelfIDToAppIDMapping(shelf_item.id) &&
           shelf_delegate->IsAppPinned(
               shelf_delegate->GetAppIDForShelfID(shelf_item.id))) {
         ++pinned_item_count;
       } else {
         ++unpinned_item_count;
       }
@@ skipping 452 matching lines @@
   return IsUserActive() && !IsKioskModeActive() && !IsArcKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this, &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 }  // namespace ash