Clean up some includes in //chrome/browser/media/router

This CL removes some apparent includes on non-media //chrome code. Most
of the changes are simply removing obsolete includes. In one case, a
Profile dependency is replaced with components-friendly UserPrefs.

Bug: 1057100
Change-Id: I6a476e4cb7ee17234b4f398bd11d3d1246c7c5d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354624
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798750}

chrome/browser/media/cast_remoting_connector.cc

@@ -17,10 +17,11 @@
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_router_feature.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/sessions/content/session_tab_helper.h"
+#include "components/user_prefs/user_prefs.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -140,7 +141,7 @@ CastRemotingConnector* CastRemotingConnector::Get(
     connector = new CastRemotingConnector(
         media_router::MediaRouterFactory::GetApiForBrowserContext(
             contents->GetBrowserContext()),
-        Profile::FromBrowserContext(contents->GetBrowserContext())->GetPrefs(),
+        user_prefs::UserPrefs::Get(contents->GetBrowserContext()),
         sessions::SessionTabHelper::IdForTab(contents),
 #if defined(TOOLKIT_VIEWS)
         base::BindRepeating(

chrome/browser/media/router/discovery/dial/dial_registry.h

@@ -18,8 +18,8 @@
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/media/router/discovery/dial/dial_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "services/network/public/cpp/network_connection_tracker.h"
+#include "url/gurl.h"
 
 namespace base {
 class Clock;

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

@@ -10,7 +10,6 @@
 #include "chrome/browser/media/router/discovery/discovery_network_monitor.h"
 #include "chrome/browser/media/router/discovery/mdns/media_sink_util.h"
 #include "chrome/browser/media/router/media_router_feature.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/media_router/media_sink.h"
 #include "components/cast_channel/cast_socket_service.h"
 #include "components/prefs/pref_service.h"

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

@@ -13,9 +13,6 @@
 #include "chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.h"
 #include "chrome/common/buildflags.h"
 
-using local_discovery::ServiceDiscoveryClient;
-using local_discovery::ServiceDiscoverySharedClient;
-
 namespace media_router {
 
 namespace {
@@ -106,11 +103,13 @@ DnsSdRegistry::ServiceTypeData::GetServiceList() {
 
 DnsSdRegistry::DnsSdRegistry() {
 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
-  service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
+  service_discovery_client_ =
+      local_discovery::ServiceDiscoverySharedClient::GetInstance();
 #endif
 }
 
-DnsSdRegistry::DnsSdRegistry(ServiceDiscoverySharedClient* client) {
+DnsSdRegistry::DnsSdRegistry(
+    local_discovery::ServiceDiscoverySharedClient* client) {
   service_discovery_client_ = client;
 }
 

chrome/browser/media/router/media_router_base.cc

@@ -9,8 +9,6 @@
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
 using blink::mojom::PresentationConnectionState;

chrome/browser/media/router/media_router_dialog_controller_unittest.cc

@@ -9,7 +9,6 @@
 
 #include "base/bind.h"
 #include "chrome/browser/media/router/media_router_metrics.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/media_router/media_route.h"
 #include "chrome/common/media_router/media_source.h"
 #include "chrome/common/media_router/route_request_result.h"

chrome/browser/media/router/presentation/local_presentation_manager_factory.cc

@@ -5,10 +5,8 @@
 #include "chrome/browser/media/router/presentation/local_presentation_manager_factory.h"
 
 #include "base/lazy_instance.h"
-
 #include "chrome/browser/media/router/presentation/local_presentation_manager.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
-#include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/web_contents.h"