Shuffles and renames ash/common/wm classes

chrome/browser/ui/ash/window_positioner_unittest.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 "ash/common/wm/window_positioner.h"
 
 #include <utility>
 
+#include "ash/aura/wm_shell_aura.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
-#include "ash/wm/aura/wm_globals_aura.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_browser_window_aura.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_windows.h"
@@ skipping 51 matching lines @@
 
   // Creating a browser for the popup.
   Browser::CreateParams popup_params(Browser::TYPE_POPUP, &profile_);
   browser_popup_ = chrome::CreateBrowserWithAuraTestWindowForParams(
       std::move(dummy_popup), &popup_params);
 
   // We hide all windows upon start - each user is required to set it up
   // as he needs it.
   window()->Hide();
   popup()->Hide();
-  window_positioner_.reset(new WindowPositioner(wm::WmGlobals::Get()));
+  window_positioner_.reset(new WindowPositioner(WmShell::Get()));
 }
 
 void WindowPositionerTest::TearDown() {
   // Since the AuraTestBase is needed to create our assets, we have to
   // also delete them before we tear it down.
   browser_.reset();
   browser_popup_.reset();
   window_positioner_.reset();
   AshTestBase::TearDown();
 }
@@ skipping 128 matching lines @@
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash