| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index bb2156a285c74eaaef452b2e81c7f5b534d43756..8902cdf3f32a0fcc86730b17a06b5e35791192d6 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1497,8 +1497,8 @@ void RenderFrameImpl::NavigateToSwappedOutURL() {
|
| }
|
|
|
| void RenderFrameImpl::BindServiceRegistry(
|
| - mojo::InterfaceRequest<mojo::InterfaceProvider> services,
|
| - mojo::InterfaceProviderPtr exposed_services) {
|
| + mojo::shell::mojom::InterfaceProviderRequest services,
|
| + mojo::shell::mojom::InterfaceProviderPtr exposed_services) {
|
| service_registry_.Bind(std::move(services));
|
| service_registry_.BindRemoteServiceProvider(std::move(exposed_services));
|
| }
|
| @@ -6004,7 +6004,7 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
|
| #if defined(ENABLE_MOJO_MEDIA)
|
| media::interfaces::ServiceFactory* RenderFrameImpl::GetMediaServiceFactory() {
|
| if (!media_service_factory_) {
|
| - mojo::InterfaceProviderPtr service_provider =
|
| + mojo::shell::mojom::InterfaceProviderPtr service_provider =
|
| ConnectToApplication(GURL("mojo:media"));
|
| mojo::GetInterface(service_provider.get(), &media_service_factory_);
|
| media_service_factory_.set_connection_error_handler(
|
| @@ -6073,11 +6073,11 @@ void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
|
| GetServiceRegistry()->ConnectToRemoteService(std::move(request));
|
| }
|
|
|
| -mojo::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
|
| +mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
|
| const GURL& url) {
|
| if (!mojo_shell_)
|
| GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
|
| - mojo::InterfaceProviderPtr service_provider;
|
| + mojo::shell::mojom::InterfaceProviderPtr service_provider;
|
| mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| request->url = mojo::String::From(url);
|
| mojo::shell::mojom::CapabilityFilterPtr filter(
|
|
|