Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index dfa3b6f340212d523143aefacf53c107094349d9..fd52c300ac90daef4eed37a798b3fdfd37da4a26 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -372,8 +372,8 @@ class RenderFrameSetupImpl : public RenderFrameSetup { |
void ExchangeInterfaceProviders( |
int32_t frame_routing_id, |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services, |
- mojo::InterfaceProviderPtr exposed_services) |
+ mojo::shell::mojom::InterfaceProviderRequest services, |
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services) |
override { |
// TODO(morrita): This is for investigating http://crbug.com/415059 and |
// should be removed once it is fixed. |
@@ -414,8 +414,8 @@ blink::WebGraphicsContext3D::Attributes GetOffscreenAttribs() { |
} |
void SetupEmbeddedWorkerOnWorkerThread( |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services, |
- mojo::InterfacePtrInfo<mojo::InterfaceProvider> exposed_services) { |
+ mojo::shell::mojom::InterfaceProviderRequest services, |
+ mojo::shell::mojom::InterfaceProviderPtrInfo exposed_services) { |
ServiceWorkerContextClient* client = |
ServiceWorkerContextClient::ThreadSpecificInstance(); |
// It is possible for client to be null if for some reason the worker died |
@@ -435,8 +435,8 @@ class EmbeddedWorkerSetupImpl : public EmbeddedWorkerSetup { |
void ExchangeInterfaceProviders( |
int32_t thread_id, |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services, |
- mojo::InterfaceProviderPtr exposed_services) override { |
+ mojo::shell::mojom::InterfaceProviderRequest services, |
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services) override { |
WorkerThreadRegistry::Instance()->GetTaskRunnerFor(thread_id)->PostTask( |
FROM_HERE, |
base::Bind(&SetupEmbeddedWorkerOnWorkerThread, base::Passed(&services), |
@@ -1087,9 +1087,9 @@ void RenderThreadImpl::AddRoute(int32_t routing_id, IPC::Listener* listener) { |
return; |
scoped_refptr<PendingRenderFrameConnect> connection(it->second); |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services( |
+ mojo::shell::mojom::InterfaceProviderRequest services( |
std::move(connection->services())); |
- mojo::InterfaceProviderPtr exposed_services( |
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services( |
std::move(connection->exposed_services())); |
exposed_services.set_connection_error_handler(mojo::Closure()); |
pending_render_frame_connects_.erase(it); |
@@ -1120,8 +1120,8 @@ void RenderThreadImpl::RemoveEmbeddedWorkerRoute(int32_t routing_id) { |
void RenderThreadImpl::RegisterPendingRenderFrameConnect( |
int routing_id, |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services, |
- mojo::InterfaceProviderPtr exposed_services) { |
+ mojo::shell::mojom::InterfaceProviderRequest services, |
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services) { |
std::pair<PendingRenderFrameConnectMap::iterator, bool> result = |
pending_render_frame_connects_.insert(std::make_pair( |
routing_id, |
@@ -2128,8 +2128,8 @@ void RenderThreadImpl::ReleaseFreeMemory() { |
RenderThreadImpl::PendingRenderFrameConnect::PendingRenderFrameConnect( |
int routing_id, |
- mojo::InterfaceRequest<mojo::InterfaceProvider> services, |
- mojo::InterfaceProviderPtr exposed_services) |
+ mojo::shell::mojom::InterfaceProviderRequest services, |
+ mojo::shell::mojom::InterfaceProviderPtr exposed_services) |
: routing_id_(routing_id), |
services_(std::move(services)), |
exposed_services_(std::move(exposed_services)) { |