mash: remove more shell/shelf WmWindow usage.

chrome/browser/chromeos/login/login_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm_window.h"
@@ skipping 311 matching lines @@
   ScopedStubInstallAttributes install_attributes_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryLoginTest);
 };
 
 // Used to make sure that the system tray is visible and within the screen
 // bounds after login.
 void TestSystemTrayIsVisible(bool otr) {
   ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray();
   aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow();
-  ash::WmWindow* wm_primary_win = ash::WmWindow::Get(primary_win);
-  ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(wm_primary_win);
+  ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(primary_win);
   SCOPED_TRACE(testing::Message()
                << "ShelfVisibilityState=" << wm_shelf->GetVisibilityState()
                << " ShelfAutoHideBehavior=" << wm_shelf->auto_hide_behavior());
   EXPECT_TRUE(tray->visible());
 
   // This check flakes for LoginGuestTest: https://crbug.com/693106.
   if (!otr)
     EXPECT_TRUE(RectContains(primary_win->bounds(), tray->GetBoundsInScreen()));
 }
 
@@ skipping 135 matching lines @@
   TestDomainVisible();
 
   fake_auth_policy_client_->set_auth_error(authpolicy::ERROR_BAD_PASSWORD);
   SubmitActiveDirectoryCredentials(kTestActiveDirectoryUser, kPassword);
   WaitForMessage(&message_queue, "\"ShowAuthError\"");
   TestPasswordError();
   TestDomainVisible();
 }
 
 }  // namespace chromeos