Adds WmWindow and converts WindowState to use it

ash/shelf/shelf_window_watcher_unittest.cc

 // Copyright 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/shelf/shelf_window_watcher.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/window_resizer.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
  public:
@@ skipping 248 matching lines @@
     // container before fininshing the dragging.
     EXPECT_TRUE(wm::GetWindowState(window.get())->is_dragged());
     new_parent->AddChild(window.get());
     EXPECT_EQ(1, model_->item_count());
   }
   EXPECT_FALSE(wm::GetWindowState(window.get())->is_dragged());
   EXPECT_EQ(1, model_->item_count());
 }
 
 }  // namespace ash