[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/wm/window_util_unittest.cc

 // Copyright (c) 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/wm/window_util.h"
 
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
 
 std::string GetAdjustedBounds(const gfx::Rect& visible,
                               gfx::Rect to_be_adjusted) {
@@ skipping 116 matching lines @@
 
   EXPECT_TRUE(MoveWindowToDisplay(window.get(), original_display_id));
   EXPECT_EQ(original_display_id,
             screen->GetDisplayNearestWindow(window.get()).id());
   EXPECT_EQ(original_container_id, window->parent()->id());
   EXPECT_EQ(original_root, window->GetRootWindow());
 }
 
 }  // namespace wm
 }  // namespace ash