Move media::mojom::RemoterFactory to content, add ContentBrowserClient API.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 274354ae57b659010e0dd2897f50aa308e4e9316..b4963e389dd00edee963a240d93255ae09d6a76c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -333,11 +333,15 @@
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/media/cast_remoting_connector.h"
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
+#endif  // defined(ENABLE_MEDIA_ROUTER)
+
+#if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/media/cast_remoting_connector.h"
 #endif
 
+
 #if defined(ENABLE_WAYLAND_SERVER)
 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 #endif
@@ -2980,12 +2984,6 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
   }
 #endif
-
-#if defined(ENABLE_MEDIA_ROUTER)
-  registry->AddInterface(
-      base::Bind(&CastRemotingConnector::CreateRemoterFactory,
-                 render_frame_host));
-#endif
 }
 
 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
@@ -3246,3 +3244,13 @@ std::unique_ptr<content::MemoryCoordinatorDelegate>
 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
   return memory::ChromeMemoryCoordinatorDelegate::Create();
 }
+
+#if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER)

[ncarter (slow), 2016/11/16 22:40:59]

Consider having this function's declaration be parameterized only on:

#if BUILDFLAG(ENABLE_MEDIA_REMOTING)

and only use defined(ENABLE_MEDIA_ROUTER) in the .cc file, in the body of the
function.

I think that'll make it a little easier to understand what happens in the
!ENABLE_MEDIA_ROUTER case -- it would also give you an #else spot where you
could add a comment explaining what happens when you drop it on the floor.

[miu, 2016/11/16 22:55:03]

Done.

+void ChromeContentBrowserClient::CreateMediaRemoter(
+    content::RenderFrameHost* render_frame_host,
+    media::mojom::RemotingSourcePtr source,
+    media::mojom::RemoterRequest request) {
+  CastRemotingConnector::CreateMediaRemoter(
+      render_frame_host, std::move(source), std::move(request));
+}
+#endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER)