Remove some media router includes in headers.

Forward declare instead. Also fix nits along the way.

Change-Id: I746a551d1ba7ac4eb85034a96464a8aaf600d6ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1714667Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680055}

chrome/browser/extensions/chrome_extensions_interface_registration.cc

@@ -22,6 +22,7 @@
 #include "services/service_manager/public/cpp/binder_registry.h"
 
 #if defined(OS_CHROMEOS)
+#include "base/task/post_task.h"
 #include "chromeos/services/ime/public/mojom/constants.mojom.h"
 #include "chromeos/services/ime/public/mojom/input_engine.mojom.h"
 #include "chromeos/services/media_perception/public/mojom/media_perception.mojom.h"

chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h"
 
+#include "chrome/browser/media/router/discovery/mdns/dns_sd_delegate.h"
+
 using local_discovery::ServiceDescription;
 
 namespace media_router {

chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h

@@ -10,7 +10,6 @@
 
 #include "base/macros.h"
 #include "chrome/browser/local_discovery/service_discovery_device_lister.h"
-#include "chrome/browser/media/router/discovery/mdns/dns_sd_delegate.h"
 
 namespace local_discovery {
 class ServiceDiscoveryClient;
@@ -18,6 +17,8 @@ class ServiceDiscoveryClient;
 
 namespace media_router {
 
+class DnsSdDelegate;
+
 // Manages a watcher for a specific MDNS/DNS-SD service type and notifies
 // a delegate of changes to watched services.
 class DnsSdDeviceLister
@@ -35,6 +36,7 @@ class DnsSdDeviceLister
   void Reset();
 
  protected:
+  // local_discovery::ServiceDiscoveryDeviceLister::Delegate:
   void OnDeviceChanged(
       const std::string& service_type,
       bool added,
@@ -52,7 +54,7 @@ class DnsSdDeviceLister
 
   // The client and service type used to create |device_lister_|.
   local_discovery::ServiceDiscoveryClient* const service_discovery_client_;
-  std::string service_type_;
+  const std::string service_type_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsSdDeviceLister);
 };

chrome/browser/media/router/providers/cast/cast_media_route_provider.h

@@ -5,6 +5,10 @@
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_CAST_CAST_MEDIA_ROUTE_PROVIDER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_CAST_CAST_MEDIA_ROUTE_PROVIDER_H_
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "base/containers/flat_map.h"
 #include "base/macros.h"
 #include "chrome/browser/media/router/providers/cast/cast_app_discovery_service.h"
@@ -16,6 +20,10 @@ namespace cast_channel {
 class CastMessageHandler;
 }
 
+namespace service_manager {
+class Connector;
+}
+
 namespace url {
 class Origin;
 }
@@ -24,6 +32,7 @@ namespace media_router {
 
 class CastActivityManager;
 class CastSessionTracker;
+class DataDecoder;
 
 // MediaRouteProvider for Cast sinks. This class may be created on any sequence.
 // All other methods, however, must be called on the task runner provided

chrome/browser/media/router/providers/cast/dual_media_sink_service.h

@@ -15,8 +15,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/sequence_checker.h"
-#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
-#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/common/media_router/discovery/media_sink_internal.h"
 #include "chrome/common/media_router/media_source.h"
@@ -28,6 +26,7 @@ class CastAppDiscoveryService;
 class CastMediaSinkService;
 class DialMediaSinkService;
 class DialMediaSinkServiceImpl;
+class MediaSinkServiceBase;
 
 // This class uses DialMediaSinkService and CastMediaSinkService to discover
 // sinks used by the Cast MediaRouteProvider. It also encapsulates the setup