exo: Fix dragging edge cases

components/exo/gamepad_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/shell.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/exo/buffer.h"
+#include "components/exo/display.h"
 #include "components/exo/gamepad.h"
 #include "components/exo/gamepad_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 "device/gamepad/gamepad_test_helpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 61 matching lines @@
 
   // Weak reference to the mock data fetcher provided by MockDataFetcherFactory.
   // This instance is valid until both gamepad_ and polling_task_runner_ are
   // shut down.
   device::MockGamepadDataFetcher* mock_data_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadTest);
 };
 
 TEST_F(GamepadTest, OnStateChange) {
+  const Display display;
   std::unique_ptr<Surface> surface(new Surface);
-  std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
+  std::unique_ptr<ShellSurface> shell_surface(
+      new ShellSurface(display, surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   testing::StrictMock<MockGamepadDelegate> delegate;
   EXPECT_CALL(delegate, CanAcceptGamepadEventsForSurface(testing::_))
       .WillOnce(testing::Return(true));
 
   InitializeGamepad(&delegate);
 
   // Gamepad connected.
   EXPECT_CALL(delegate, OnStateChange(true)).Times(1);
   blink::WebGamepads gamepad_connected;
   gamepad_connected.length = 1;
   gamepad_connected.items[0].connected = true;
   gamepad_connected.items[0].timestamp = 1;
   SetDataAndPostToDelegate(gamepad_connected);
 
   // Gamepad disconnected.
   blink::WebGamepads all_disconnected;
   EXPECT_CALL(delegate, OnStateChange(false)).Times(1);
   SetDataAndPostToDelegate(all_disconnected);
 
   DestroyGamepad(&delegate);
 }
 
 TEST_F(GamepadTest, OnAxis) {
+  const Display display;
   std::unique_ptr<Surface> surface(new Surface);
-  std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
+  std::unique_ptr<ShellSurface> shell_surface(
+      new ShellSurface(display, surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   testing::StrictMock<MockGamepadDelegate> delegate;
   EXPECT_CALL(delegate, CanAcceptGamepadEventsForSurface(testing::_))
       .WillOnce(testing::Return(true));
 
   InitializeGamepad(&delegate);
 
   blink::WebGamepads axis_moved;
   axis_moved.length = 1;
   axis_moved.items[0].connected = true;
   axis_moved.items[0].timestamp = 1;
   axis_moved.items[0].axesLength = 1;
   axis_moved.items[0].axes[0] = 1.0;
 
   EXPECT_CALL(delegate, OnStateChange(true)).Times(1);
   EXPECT_CALL(delegate, OnAxis(0, 1.0)).Times(1);
   EXPECT_CALL(delegate, OnFrame()).Times(1);
   SetDataAndPostToDelegate(axis_moved);
 
   DestroyGamepad(&delegate);
 }
 
 TEST_F(GamepadTest, OnButton) {
+  const Display display;
   std::unique_ptr<Surface> surface(new Surface);
-  std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
+  std::unique_ptr<ShellSurface> shell_surface(
+      new ShellSurface(display, surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   testing::StrictMock<MockGamepadDelegate> delegate;
   EXPECT_CALL(delegate, CanAcceptGamepadEventsForSurface(testing::_))
       .WillOnce(testing::Return(true));
 
@@ skipping 10 matching lines @@
   EXPECT_CALL(delegate, OnStateChange(true)).Times(1);
   EXPECT_CALL(delegate, OnButton(0, true, 1.0)).Times(1);
   EXPECT_CALL(delegate, OnFrame()).Times(1);
   SetDataAndPostToDelegate(axis_moved);
 
   DestroyGamepad(&delegate);
 }
 
 TEST_F(GamepadTest, OnWindowFocused) {
   // Create surface and move focus to it.
+  const Display display;
   std::unique_ptr<Surface> surface(new Surface);
-  std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
+  std::unique_ptr<ShellSurface> shell_surface(
+      new ShellSurface(display, surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   testing::StrictMock<MockGamepadDelegate> delegate;
   EXPECT_CALL(delegate, CanAcceptGamepadEventsForSurface(testing::_))
       .WillOnce(testing::Return(true));
 
@@ skipping 17 matching lines @@
   // scheduled in the next round.
   polling_task_runner_->RunPendingTasks();
   polling_task_runner_->RunPendingTasks();
   ASSERT_FALSE(polling_task_runner_->HasPendingTask());
 
   DestroyGamepad(&delegate);
 }
 
 }  // namespace
 }  // namespace exo