Move yet more from WmShell to Shell

ash/metrics/user_metrics_recorder_unittest.cc

 // Copyright 2015 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 <memory>
 
 #include "ash/common/login_status.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/test/test_shelf_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/user_metrics_recorder_test_api.h"
 #include "base/test/histogram_tester.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace {
 
 const char kAsh_NumberOfVisibleWindowsInPrimaryDisplay[] =
     "Ash.NumberOfVisibleWindowsInPrimaryDisplay";
@@ skipping 164 matching lines @@
 TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
   // TODO: investigate failure in mash, http://crbug.com/695629.
   if (WmShell::Get()->IsRunningInMash())
     return;
 
   test::TestShelfDelegate* test_shelf_delegate =
       test::TestShelfDelegate::instance();
   SetUserInActiveDesktopEnvironment(true);
 
   // Make sure the shelf contains the app list launcher button.
-  const ShelfItems& shelf_items = WmShell::Get()->shelf_model()->items();
+  const ShelfItems& shelf_items = Shell::Get()->shelf_model()->items();
   ASSERT_EQ(1u, shelf_items.size());
   ASSERT_EQ(TYPE_APP_LIST, shelf_items[0].type);
 
   aura::Window* pinned_window_with_app_id_1 = CreateTestWindow();
   test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_1),
                                     "app_id_1");
   test_shelf_delegate->PinAppWithID("app_id_1");
 
   aura::Window* pinned_window_with_app_id_2 = CreateTestWindow();
   test_shelf_delegate->AddShelfItem(WmWindow::Get(pinned_window_with_app_id_2),
@@ skipping 10 matching lines @@
   aura::Window* unpinned_window_5 = CreateTestWindow();
   test_shelf_delegate->AddShelfItem(WmWindow::Get(unpinned_window_5));
 
   user_metrics_recorder_test_api()->RecordPeriodicMetrics();
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfItems, 5, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfPinnedItems, 2, 1);
   histograms().ExpectBucketCount(kAsh_Shelf_NumberOfUnpinnedItems, 3, 1);
 }
 
 }  // namespace ash