Move WebGamepadListener out of public/platform

//third_party/blink/renderer/modules/gamepad is the only user of
blink::WebGamepadListener. Move its definition there as
blink::GamepadListener.

Also remove blink::WebPlatformEventListener, which was only used by
blink::WebGamepadListener as an empty parent class.

Bug: 919392
Change-Id: If7831dccc0ff405264320c2bd08c586a872f0422
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1886891Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Balazs Kelemen <b.kelemen@samsung.com>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#712248}

content/shell/test_runner/gamepad_controller.cc

@@ -4,7 +4,8 @@
 
 #include "content/shell/test_runner/gamepad_controller.h"
 
-#include <string.h>
+#include <string>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ -17,7 +18,6 @@
 #include "gin/wrappable.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
-#include "third_party/blink/public/platform/web_gamepad_listener.h"
 #include "third_party/blink/public/web/blink.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "v8/include/v8.h"

third_party/blink/public/BUILD.gn

@@ -219,7 +219,6 @@ source_set("blink_headers") {
     "platform/web_font.h",
     "platform/web_font_description.h",
     "platform/web_font_render_style.h",
-    "platform/web_gamepad_listener.h",
     "platform/web_gesture_curve.h",
     "platform/web_gesture_device.h",
     "platform/web_gesture_event.h",
@@ -261,7 +260,6 @@ source_set("blink_headers") {
     "platform/web_mouse_wheel_event.h",
     "platform/web_navigation_body_loader.h",
     "platform/web_network_state_notifier.h",
-    "platform/web_platform_event_listener.h",
     "platform/web_point.h",
     "platform/web_pointer_event.h",
     "platform/web_pointer_properties.h",

third_party/blink/public/platform/web_platform_event_listener.h

-// Copyright 2014 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.
-
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_PLATFORM_EVENT_LISTENER_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_PLATFORM_EVENT_LISTENER_H_
-
-namespace blink {
-
-class WebPlatformEventListener {
- public:
-  virtual ~WebPlatformEventListener() = default;
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_PLATFORM_EVENT_LISTENER_H_

third_party/blink/renderer/modules/gamepad/BUILD.gn

@@ -24,6 +24,7 @@ blink_modules_sources("gamepad") {
     "gamepad_haptic_actuator.h",
     "gamepad_list.cc",
     "gamepad_list.h",
+    "gamepad_listener.h",
     "gamepad_shared_memory_reader.cc",
     "gamepad_shared_memory_reader.h",
     "navigator_gamepad.cc",

third_party/blink/renderer/modules/gamepad/gamepad_dispatcher.h

@@ -10,8 +10,8 @@
 #include "base/memory/scoped_refptr.h"
 #include "device/gamepad/public/mojom/gamepad.mojom-blink.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "third_party/blink/public/platform/web_gamepad_listener.h"
 #include "third_party/blink/renderer/core/frame/platform_event_dispatcher.h"
+#include "third_party/blink/renderer/modules/gamepad/gamepad_listener.h"
 
 namespace device {
 class Gamepad;
@@ -24,7 +24,7 @@ class GamepadSharedMemoryReader;
 
 class GamepadDispatcher final : public GarbageCollected<GamepadDispatcher>,
                                 public PlatformEventDispatcher,
-                                public WebGamepadListener {
+                                public GamepadListener {
   USING_GARBAGE_COLLECTED_MIXIN(GamepadDispatcher);
 
  public:
@@ -48,7 +48,7 @@ class GamepadDispatcher final : public GarbageCollected<GamepadDispatcher>,
  private:
   void InitializeHaptics();
 
-  // WebGamepadListener
+  // GamepadListener
   void DidConnectGamepad(uint32_t index, const device::Gamepad&) override;
   void DidDisconnectGamepad(uint32_t index, const device::Gamepad&) override;
   void ButtonOrAxisDidChange(uint32_t index, const device::Gamepad&) override;
@@ -69,4 +69,4 @@ class GamepadDispatcher final : public GarbageCollected<GamepadDispatcher>,
 
 }  // namespace blink
 
-#endif
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_DISPATCHER_H_

third_party/blink/public/platform/web_gamepad_listener.h → third_party/blink/renderer/modules/gamepad/gamepad_listener.h

@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_GAMEPAD_LISTENER_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_GAMEPAD_LISTENER_H_
-
-#include "third_party/blink/public/platform/web_platform_event_listener.h"
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_LISTENER_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_LISTENER_H_
 
 namespace device {
 class Gamepad;
@@ -13,8 +11,10 @@ class Gamepad;
 
 namespace blink {
 
-class WebGamepadListener : public WebPlatformEventListener {
+class GamepadListener {
  public:
+  virtual ~GamepadListener() = default;
+
   // Called when a gamepad is connected. |index| is the index of the gamepad in
   // the gamepad array, and |gamepad| is a reference to the connected gamepad.
   virtual void DidConnectGamepad(uint32_t index,
@@ -31,11 +31,8 @@ class WebGamepadListener : public WebPlatformEventListener {
   // to the gamepad.
   virtual void ButtonOrAxisDidChange(uint32_t index,
                                      const device::Gamepad& gamepad) = 0;
-
- protected:
-  ~WebGamepadListener() override = default;
 };
 
 }  // namespace blink
 
-#endif
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_LISTENER_H_

third_party/blink/renderer/modules/gamepad/gamepad_shared_memory_reader.cc

@@ -11,8 +11,8 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/interface_provider.h"
-#include "third_party/blink/public/platform/web_gamepad_listener.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/renderer/modules/gamepad/gamepad_listener.h"
 
 namespace blink {
 
@@ -39,7 +39,7 @@ void GamepadSharedMemoryReader::SendStopMessage() {
   }
 }
 
-void GamepadSharedMemoryReader::Start(blink::WebGamepadListener* listener) {
+void GamepadSharedMemoryReader::Start(blink::GamepadListener* listener) {
   DCHECK(!listener_);
   listener_ = listener;
 

third_party/blink/renderer/modules/gamepad/gamepad_shared_memory_reader.h

@@ -25,8 +25,8 @@ class Gamepads;
 
 namespace blink {
 
+class GamepadListener;
 class LocalFrame;
-class WebGamepadListener;
 
 class GamepadSharedMemoryReader : public device::mojom::blink::GamepadObserver {
  public:
@@ -34,7 +34,7 @@ class GamepadSharedMemoryReader : public device::mojom::blink::GamepadObserver {
   ~GamepadSharedMemoryReader() override;
 
   void SampleGamepads(device::Gamepads& gamepads);
-  void Start(blink::WebGamepadListener* listener);
+  void Start(blink::GamepadListener* listener);
   void Stop();
 
  protected:
@@ -58,7 +58,7 @@ class GamepadSharedMemoryReader : public device::mojom::blink::GamepadObserver {
 
   mojo::Receiver<device::mojom::blink::GamepadObserver> receiver_{this};
   mojo::Remote<device::mojom::blink::GamepadMonitor> gamepad_monitor_remote_;
-  blink::WebGamepadListener* listener_ = nullptr;
+  blink::GamepadListener* listener_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadSharedMemoryReader);
 };