| Index: content/public/test/mock_render_thread.cc | 
| diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc | 
| index bcd73c94aa0e4bd75d4539e40fa2c263b45f12b7..f0cda4f5bd1a001f69d388a279b4144877bdbad5 100644 | 
| --- a/content/public/test/mock_render_thread.cc | 
| +++ b/content/public/test/mock_render_thread.cc | 
| @@ -231,18 +231,18 @@ ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() { | 
| return nullptr; | 
| } | 
|  | 
| -shell::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() { | 
| +service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() { | 
| if (!interface_registry_) | 
| -    interface_registry_.reset(new shell::InterfaceRegistry); | 
| +    interface_registry_.reset(new service_manager::InterfaceRegistry); | 
| return interface_registry_.get(); | 
| } | 
|  | 
| -shell::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() { | 
| +service_manager::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() { | 
| if (!remote_interfaces_) { | 
| -    shell::mojom::InterfaceProviderPtr remote_interface_provider; | 
| +    service_manager::mojom::InterfaceProviderPtr remote_interface_provider; | 
| pending_remote_interface_provider_request_ = | 
| GetProxy(&remote_interface_provider); | 
| -    remote_interfaces_.reset(new shell::InterfaceProvider); | 
| +    remote_interfaces_.reset(new service_manager::InterfaceProvider); | 
| remote_interfaces_->Bind(std::move(remote_interface_provider)); | 
| } | 
| return remote_interfaces_.get(); | 
|  |