mash: Migrate Shelf aura::Window uses to WmWindow.

chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Index: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 862f6026f995790610874d0e8acc4f3bcc5f5514..3690eaf482d013c656051f58f67ec9834cc7b642 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
@@ -53,7 +54,8 @@ void CloseBrowser(Browser* browser) {
 }
 
 gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) {
-  ash::Shelf* shelf = ash::Shelf::ForWindow(root_window);
+  ash::Shelf* shelf =
+      ash::Shelf::ForWindow(ash::WmWindowAura::Get(root_window));
   const ash::ShelfView* shelf_view =
       ash::test::ShelfTestAPI(shelf).shelf_view();
   const views::ViewModel* view_model = shelf_view->view_model_for_test();