| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index bbe270af4d9e98091be258047c26d9e41eee61b2..26db7cf140180fd3cd0eda4cb361a6041f9e5384 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -5997,7 +5997,7 @@ RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
|
| media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
|
| if (!media_permission_dispatcher_) {
|
| media_permission_dispatcher_.reset(new MediaPermissionDispatcher(
|
| - base::Bind(&RenderFrameImpl::ConnectToService<PermissionService>,
|
| + base::Bind(&RenderFrameImpl::GetInterface<PermissionService>,
|
| base::Unretained(this))));
|
| }
|
| return media_permission_dispatcher_.get();
|
| @@ -6008,7 +6008,7 @@ media::interfaces::ServiceFactory* RenderFrameImpl::GetMediaServiceFactory() {
|
| if (!media_service_factory_) {
|
| mojo::InterfaceProviderPtr service_provider =
|
| ConnectToApplication(GURL("mojo:media"));
|
| - mojo::ConnectToService(service_provider.get(), &media_service_factory_);
|
| + mojo::GetInterface(service_provider.get(), &media_service_factory_);
|
| media_service_factory_.set_connection_error_handler(
|
| base::Bind(&RenderFrameImpl::OnMediaServiceFactoryConnectionError,
|
| base::Unretained(this)));
|
| @@ -6071,8 +6071,7 @@ void RenderFrameImpl::RegisterMojoServices() {
|
| }
|
|
|
| template <typename Interface>
|
| -void RenderFrameImpl::ConnectToService(
|
| - mojo::InterfaceRequest<Interface> request) {
|
| +void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
|
| GetServiceRegistry()->ConnectToRemoteService(std::move(request));
|
| }
|
|
|
|
|