Removes a couple more functions from WmWindow

ash/wm/overview/window_selector_unittest.cc

Index: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 6cdd5e83c6564736121bc0217dab5f974839abd6..3548346f0b014add1ac7a9b17f69ed884332f34f 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -516,9 +516,9 @@ TEST_F(WindowSelectorTest, WindowsOrder) {
   ToggleOverview();
   const std::vector<std::unique_ptr<WindowSelectorItem>>& overview1 =
       GetWindowItemsForRoot(0);
-  EXPECT_EQ(1, overview1[0]->GetWindow()->GetShellWindowId());
-  EXPECT_EQ(3, overview1[1]->GetWindow()->GetShellWindowId());
-  EXPECT_EQ(2, overview1[2]->GetWindow()->GetShellWindowId());
+  EXPECT_EQ(1, overview1[0]->GetWindow()->aura_window()->id());
+  EXPECT_EQ(3, overview1[1]->GetWindow()->aura_window()->id());
+  EXPECT_EQ(2, overview1[2]->GetWindow()->aura_window()->id());
   ToggleOverview();
 
   // Activate the second window.
@@ -528,9 +528,9 @@ TEST_F(WindowSelectorTest, WindowsOrder) {
       GetWindowItemsForRoot(0);
 
   // The order should be MRU.
-  EXPECT_EQ(2, overview2[0]->GetWindow()->GetShellWindowId());
-  EXPECT_EQ(1, overview2[1]->GetWindow()->GetShellWindowId());
-  EXPECT_EQ(3, overview2[2]->GetWindow()->GetShellWindowId());
+  EXPECT_EQ(2, overview2[0]->GetWindow()->aura_window()->id());
+  EXPECT_EQ(1, overview2[1]->GetWindow()->aura_window()->id());
+  EXPECT_EQ(3, overview2[2]->GetWindow()->aura_window()->id());
   ToggleOverview();
 }
 
@@ -1403,7 +1403,7 @@ TEST_F(WindowSelectorTest, BasicArrowKeyNavigation) {
       // string from the window IDs.
       const int index = index_path_for_direction[key_index][i];
       EXPECT_EQ(GetSelectedWindow()->id(),
-                overview_windows[index - 1]->GetWindow()->GetShellWindowId());
+                overview_windows[index - 1]->GetWindow()->aura_window()->id());
     }
     ToggleOverview();
   }