mash: Migrate ShelfButton* to wm common types

ash/common/shelf/shelf_button_pressed_metric_tracker_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/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
 
 #include <utility>
 
-#include "ash/shelf/shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/user_action_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
@@ skipping 79 matching lines @@
         ShelfButtonPressedMetricTracker::
             kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName;
 
 ShelfButtonPressedMetricTrackerTest::ShelfButtonPressedMetricTrackerTest() {}
 
 ShelfButtonPressedMetricTrackerTest::~ShelfButtonPressedMetricTrackerTest() {}
 
 void ShelfButtonPressedMetricTrackerTest::SetUp() {
   AshTestBase::SetUp();
 
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
-  ShelfViewTestAPI shelf_view_test_api(ShelfTestAPI(shelf).shelf_view());
+  WmShelf* wm_shelf = GetPrimaryShelf();
+  ShelfViewTestAPI shelf_view_test_api(wm_shelf->GetShelfViewForTesting());
 
   metric_tracker_ = shelf_view_test_api.shelf_button_pressed_metric_tracker();
 
   ShelfButtonPressedMetricTrackerTestAPI test_api(metric_tracker_);
 
   std::unique_ptr<base::TickClock> test_tick_clock(
       new base::SimpleTestTickClock());
   tick_clock_ = static_cast<base::SimpleTestTickClock*>(test_tick_clock.get());
   test_api.SetTickClock(std::move(test_tick_clock));
 
@@ skipping 167 matching lines @@
 
   histogram_tester.ExpectTotalCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName, 1);
   histogram_tester.ExpectBucketCount(
       kTimeBetweenWindowMinimizedAndActivatedActionsHistogramName,
       kTimeDeltaInMilliseconds, 1);
 }
 
 }  // namespace test
 }  // namespace ash