mash: remove more shell/shelf WmWindow usage.

ash/sticky_keys/sticky_keys_overlay_unittest.cc

 // Copyright 2014 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/sticky_keys/sticky_keys_overlay.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
@@ skipping 50 matching lines @@
   // http://crbug.com/696754.
   if (Shell::GetAshConfig() == Config::MASH)
     return;
   display_manager()->SetLayoutForCurrentDisplays(
       display::test::CreateDisplayLayout(display_manager(),
                                          display::DisplayPlacement::LEFT, 0));
 
   // The overlay should belong to the secondary root window.
   StickyKeysOverlay overlay;
   views::Widget* overlay_widget = overlay.GetWidgetForTesting();
-  EXPECT_EQ(ShellPort::Get()
-                ->GetRootWindowForDisplayId(secondary_display_id)
-                ->aura_window(),
+  EXPECT_EQ(ShellPort::Get()->GetRootWindowForDisplayId(secondary_display_id),
             overlay_widget->GetNativeWindow()->GetRootWindow());
 
   // Removing the second display should move the overlay to the primary root
   // window.
   UpdateDisplay("1280x1024");
-  EXPECT_EQ(ShellPort::Get()
-                ->GetRootWindowForDisplayId(primary_display_id)
-                ->aura_window(),
+  EXPECT_EQ(ShellPort::Get()->GetRootWindowForDisplayId(primary_display_id),
             overlay_widget->GetNativeWindow()->GetRootWindow());
 
   overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_ENABLED);
   EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
   overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED);
   EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
             overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN));
 }
 
 // Additional sticky key overlay tests that depend on ui::EventRewriterChromeOS
 // are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc .
 
 }  // namespace ash