Removes a couple more functions from WmWindow

ash/wm/container_finder_unittest.cc

Index: ash/wm/container_finder_unittest.cc
diff --git a/ash/wm/container_finder_unittest.cc b/ash/wm/container_finder_unittest.cc
index 459ac7d32d348d0a124eb47abb585974e2a36b8e..44b82613f15a3f2c0397f02055045c436d81d294 100644
--- a/ash/wm/container_finder_unittest.cc
+++ b/ash/wm/container_finder_unittest.cc
@@ -9,6 +9,7 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/test/ash_test.h"
 #include "ash/wm_window.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 
@@ -20,15 +21,15 @@ TEST_F(ContainerFinderTest, GetContainerForWindow) {
   // Create a normal widget in the default container.
   std::unique_ptr<views::Widget> widget =
       CreateTestWidget(gfx::Rect(1, 2, 3, 4));
-  WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
+  aura::Window* window = widget->GetNativeWindow();
 
   // The window itself is not a container.
-  EXPECT_EQ(kShellWindowId_Invalid, window->GetShellWindowId());
+  EXPECT_EQ(kShellWindowId_Invalid, window->id());
 
   // Container lookup finds the default container.
-  WmWindow* container = wm::GetContainerForWindow(window);
+  WmWindow* container = wm::GetContainerForWindow(WmWindow::Get(window));
   ASSERT_TRUE(container);
-  EXPECT_EQ(kShellWindowId_DefaultContainer, container->GetShellWindowId());
+  EXPECT_EQ(kShellWindowId_DefaultContainer, container->aura_window()->id());
 }
 
 }  // namespace ash