Separates out accelerators using non-common types

components/exo/touch_unittest.cc

 // Copyright 2015 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/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
-#include "ash/wm/window_util.h"
 #include "components/exo/buffer.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_helper.h"
 #include "components/exo/touch.h"
 #include "components/exo/touch_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/test/event_generator.h"
@@ skipping 22 matching lines @@
   ash::WindowPositioner::DisableAutoPositioning(true);
 
   std::unique_ptr<Surface> bottom_surface(new Surface);
   std::unique_ptr<ShellSurface> bottom_shell_surface(
       new ShellSurface(bottom_surface.get()));
   gfx::Size bottom_buffer_size(10, 10);
   std::unique_ptr<Buffer> bottom_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(bottom_buffer_size)));
   bottom_surface->Attach(bottom_buffer.get());
   bottom_surface->Commit();
-  ash::wm::CenterWindow(bottom_shell_surface->GetWidget()->GetNativeWindow());
+  ash::wm::CenterWindow(ash::WmWindowAura::Get(
+      bottom_shell_surface->GetWidget()->GetNativeWindow()));
 
   std::unique_ptr<Surface> top_surface(new Surface);
   std::unique_ptr<ShellSurface> top_shell_surface(
       new ShellSurface(top_surface.get()));
   gfx::Size top_buffer_size(8, 8);
   std::unique_ptr<Buffer> top_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(top_buffer_size)));
   top_surface->Attach(top_buffer.get());
   top_surface->Commit();
-  ash::wm::CenterWindow(top_shell_surface->GetWidget()->GetNativeWindow());
+  ash::wm::CenterWindow(ash::WmWindowAura::Get(
+      top_shell_surface->GetWidget()->GetNativeWindow()));
 
   MockTouchDelegate delegate;
   std::unique_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(top_surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate,
               OnTouchDown(top_surface.get(), testing::_, 1, gfx::Point()));
   generator.set_current_location(
@@ skipping 132 matching lines @@
 
   // Create surface for modal window.
   std::unique_ptr<Surface> surface2(new Surface);
   std::unique_ptr<ShellSurface> shell_surface2(
       new ShellSurface(surface2.get(), nullptr, gfx::Rect(0, 0, 5, 5), true,
                        ash::kShellWindowId_SystemModalContainer));
   std::unique_ptr<Buffer> buffer2(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(gfx::Size(5, 5))));
   surface2->Attach(buffer2.get());
   surface2->Commit();
-  ash::wm::CenterWindow(surface2->window());
+  ash::wm::CenterWindow(ash::WmWindowAura::Get(surface2->window()));
   gfx::Point location2 = surface2->window()->GetBoundsInScreen().origin();
 
   // Make the window modal.
   shell_surface2->SetSystemModal(true);
   EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface2.get()))
       .WillRepeatedly(testing::Return(true));
@@ skipping 39 matching lines @@
   }
   generator.set_current_location(location);
   generator.PressMoveAndReleaseTouchBy(1, 1);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 }  // namespace
 }  // namespace exo