Move media_stream_dispatcher_eventhandler.h out of the Blink exposed API

The next step is to merge it into MediaStreamDispatcherEventHandler
class MediaStreamDeviceObserver, its only implementer.

BUG=704136
R=haraken@chromium.org

Change-Id: Ifbb3ed41dc5a9b7315bc4210e76961c98a098b61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1749622
Auto-Submit: Antonio Gomes <tonikitoo@igalia.com>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686251}

third_party/blink/public/BUILD.gn

@@ -145,7 +145,6 @@ source_set("blink_headers") {
     "platform/modules/mediastream/media_stream_audio_processor_options.h",
     "platform/modules/mediastream/media_stream_audio_source.h",
     "platform/modules/mediastream/media_stream_audio_track.h",
-    "platform/modules/mediastream/media_stream_dispatcher_eventhandler.h",
     "platform/modules/mediastream/media_stream_types.h",
     "platform/modules/mediastream/secure_display_link_tracker.h",
     "platform/modules/mediastream/web_media_element_source_utils.h",

third_party/blink/renderer/modules/mediastream/media_stream_device_observer.cc

@@ -11,9 +11,9 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "third_party/blink/public/platform/interface_registry.h"
-#include "third_party/blink/public/platform/modules/mediastream/media_stream_dispatcher_eventhandler.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
+#include "third_party/blink/renderer/platform/mediastream/media_stream_dispatcher_eventhandler.h"
 
 namespace blink {
 

third_party/blink/renderer/modules/mediastream/user_media_processor.h

@@ -18,12 +18,12 @@
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
 #include "third_party/blink/public/mojom/mediastream/media_devices.mojom-blink.h"
 #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-blink.h"
-#include "third_party/blink/public/platform/modules/mediastream/media_stream_dispatcher_eventhandler.h"
 #include "third_party/blink/public/platform/modules/mediastream/web_platform_media_stream_source.h"
 #include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/blink/public/web/web_user_media_request.h"
 #include "third_party/blink/renderer/modules/mediastream/media_stream_constraints_util_audio.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
+#include "third_party/blink/renderer/platform/mediastream/media_stream_dispatcher_eventhandler.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 

third_party/blink/renderer/platform/BUILD.gn

@@ -1195,6 +1195,7 @@ jumbo_component("platform") {
     "mediastream/media_stream_component.h",
     "mediastream/media_stream_descriptor.cc",
     "mediastream/media_stream_descriptor.h",
+    "mediastream/media_stream_dispatcher_eventhandler.h",
     "mediastream/media_stream_source.cc",
     "mediastream/media_stream_source.h",
     "mediastream/media_stream_web_audio_source.cc",

third_party/blink/public/platform/modules/mediastream/media_stream_dispatcher_eventhandler.h → third_party/blink/renderer/platform/mediastream/media_stream_dispatcher_eventhandler.h

@@ -2,26 +2,22 @@
 // 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_MODULES_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_
-
-#include <string>
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_
 
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
-#include "third_party/blink/public/platform/web_common.h"
+#include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace blink {
 
-// TODO(crbug.com/704136): Move this class out of the Blink exposed API
-// when all users of it have been Onion souped.
-class BLINK_PLATFORM_EXPORT MediaStreamDispatcherEventHandler {
+class PLATFORM_EXPORT MediaStreamDispatcherEventHandler {
  public:
   // A device has been stopped in the browser process.
-  virtual void OnDeviceStopped(const blink::MediaStreamDevice& device) = 0;
+  virtual void OnDeviceStopped(const MediaStreamDevice& device) = 0;
 
   // Switch to the new device within the working session.
-  virtual void OnDeviceChanged(const blink::MediaStreamDevice& old_device,
-                               const blink::MediaStreamDevice& new_device) = 0;
+  virtual void OnDeviceChanged(const MediaStreamDevice& old_device,
+                               const MediaStreamDevice& new_device) = 0;
 
  protected:
   virtual ~MediaStreamDispatcherEventHandler() {}
@@ -29,4 +25,4 @@ class BLINK_PLATFORM_EXPORT MediaStreamDispatcherEventHandler {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_MEDIASTREAM_MEDIA_STREAM_DISPATCHER_EVENTHANDLER_H_