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

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 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.
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 78 matching lines @@
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "device/generic_sensor/sensor_provider_impl.h"
 #include "device/geolocation/geolocation_service_context.h"
 #include "device/vibration/vibration_manager_impl.h"
 #include "device/wake_lock/wake_lock_service_context.h"
 #include "media/base/media_switches.h"
+#include "media/media_features.h"
 #include "media/mojo/interfaces/media_service.mojom.h"
+#include "media/mojo/interfaces/remoting.mojom.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetection.mojom.h"
 #include "ui/accessibility/ax_tree.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "url/gurl.h"
 
@@ skipping 2132 matching lines @@
         base::Bind(&MediaDevicesDispatcherHost::Create, GetProcess()->GetID(),
                    GetRoutingID(), GetProcess()
                                        ->GetBrowserContext()
                                        ->GetResourceContext()
                                        ->GetMediaDeviceIDSalt(),
                    base::Unretained(media_stream_manager)),
         BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
   }
 #endif
 
+#if BUILDFLAG(ENABLE_MEDIA_REMOTING)
+  // Add a no-op RemoterFactory binder. Embedders that support media remoting
+  // will override this via their ContentBrowserClient.
+  class NullRemoterFactory final : public media::mojom::RemoterFactory {

[Ben Goodger (Google), 2016/11/16 18:56:13]

Since the renderer requires this always, rather than replacing having the
embedder replace the factory (which seems a little scary, if the call out to
RenderRenderFrameMojoInterfaces ever moves around), why not just add a
special-purpose method to the browser client to bind this request & have the
canonical RemoteFactory factory live here?

[miu, 2016/11/16 22:30:06]

Done. Prior to this, I had assumed it was normal/SOP for the service-side
binding to be optional--based on whether support was present in the
embedder--and so it would be fine if some embedders did not register with the
InterfaceRegistry. AFAIK, this was never made clear in any Mojo-in-Chromium
documentation.

+   public:
+    void Create(media::mojom::RemotingSourcePtr source,
+                media::mojom::RemoterRequest remoter) final {}
+    static void CreateRemoterFactory(
+        media::mojom::RemoterFactoryRequest request) {
+      mojo::MakeStrongBinding(base::MakeUnique<NullRemoterFactory>(),
+                              std::move(request));
+    }
+  };
+  GetInterfaceRegistry()->AddInterface(
+      base::Bind(&NullRemoterFactory::CreateRemoterFactory));
+#endif  // BUILDFLAG(ENABLE_MEDIA_REMOTING)
+
   GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces(
       GetInterfaceRegistry(), this);
 }
 
 void RenderFrameHostImpl::ResetWaitingState() {
   DCHECK(is_active());
 
   // Whenever we reset the RFH state, we should not be waiting for beforeunload
   // or close acks.  We clear them here to be safe, since they can cause
   // navigations to be ignored in OnDidCommitProvisionalLoad.
@@ skipping 1004 matching lines @@
   // There is no pending NavigationEntry in these cases, so pass 0 as the
   // pending_nav_entry_id. If the previous handle was a prematurely aborted
   // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
   return NavigationHandleImpl::Create(
       params.url, frame_tree_node_, is_renderer_initiated,
       params.was_within_same_page, params.is_srcdoc, base::TimeTicks::Now(),
       entry_id_for_data_nav, false);  // started_from_context_menu
 }
 
 }  // namespace content