mash: Convert ShelfView to wm common types, clean up Shelf access

ash/test/shelf_view_test_api.cc

 // Copyright (c) 2012 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/test/shelf_view_test_api.h"
 
 #include "ash/common/shelf/overflow_button.h"
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_view.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view_model.h"
 
 namespace {
 
 // A class used to wait for animations.
 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
  public:
@@ skipping 134 matching lines @@
   return shelf_view_->dragged_off_from_overflow_to_shelf_;
 }
 
 ShelfButtonPressedMetricTracker*
 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
   return &(shelf_view_->shelf_button_pressed_metric_tracker_);
 }
 
 }  // namespace test
 }  // namespace ash