Renames WmShell to ShellPort

components/exo/pointer_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 "components/exo/pointer.h"

[reveman, 2017/04/10 20:50:28]

nit: blank line after this

[sky, 2017/04/10 20:58:36]

THis is a bug in git cl format. I fixed this and filed 710164.

 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/wm/window_positioning_utils.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "components/exo/buffer.h"
-#include "components/exo/pointer.h"
 #include "components/exo/pointer_delegate.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 "testing/gmock/include/gmock/gmock.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 
 namespace exo {
@@ skipping 290 matching lines @@
       true, false, 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(ash::WmWindow::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_TRUE(ash::ShellPort::Get()->IsSystemModalWindowOpen());
 
   EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface2.get()))
       .WillRepeatedly(testing::Return(true));
 
   // Check if pointer events on modal window are registered.
   {
     testing::InSequence sequence;
@@ skipping 68 matching lines @@
   generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
 
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnPointerLeave(surface.get())).Times(0);
   }
   generator.MoveMouseTo(surface->window()->GetBoundsInScreen().bottom_right());
 
   // Make the window non-modal.
   shell_surface2->SetSystemModal(false);
-  EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
+  EXPECT_FALSE(ash::ShellPort::Get()->IsSystemModalWindowOpen());
 
   // Check if pointer events on non-modal window are registered.
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::PointF(), 0));
   }
   generator.MoveMouseTo(location);
 
   {
     testing::InSequence sequence;
@@ skipping 24 matching lines @@
     EXPECT_CALL(delegate, OnPointerLeave(surface.get()));
   }
   generator.MoveMouseTo(surface->window()->GetBoundsInScreen().bottom_right());
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 }  // namespace
 }  // namespace exo