Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces.

media/mojo/services/service_factory_impl.h

Index: media/mojo/services/service_factory_impl.h
diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h
index 9a69e4f2d6e46560173eef761599e9cfb140ce4d..ec9b27b1ade3ceab73e9f134494425d21227589f 100644
--- a/media/mojo/services/service_factory_impl.h
+++ b/media/mojo/services/service_factory_impl.h
@@ -13,8 +13,12 @@
 
 namespace mojo {
 class AppRefCount;
+namespace shell {
+namespace mojom {
 class InterfaceProvider;
 }
+}
+}
 
 namespace media {
 
@@ -26,7 +30,7 @@ class RendererFactory;
 class ServiceFactoryImpl : public interfaces::ServiceFactory {
  public:
   ServiceFactoryImpl(mojo::InterfaceRequest<interfaces::ServiceFactory> request,
-                     mojo::InterfaceProvider* interfaces,
+                     mojo::shell::mojom::InterfaceProvider* interfaces,
                      scoped_refptr<MediaLog> media_log,
                      scoped_ptr<mojo::AppRefCount> parent_app_refcount,
                      MojoMediaClient* mojo_media_client);
@@ -45,7 +49,7 @@ class ServiceFactoryImpl : public interfaces::ServiceFactory {
   MojoCdmServiceContext cdm_service_context_;
 
   mojo::StrongBinding<interfaces::ServiceFactory> binding_;
-  mojo::InterfaceProvider* interfaces_;
+  mojo::shell::mojom::InterfaceProvider* interfaces_;
   scoped_refptr<MediaLog> media_log_;
   scoped_ptr<mojo::AppRefCount> parent_app_refcount_;
   MojoMediaClient* mojo_media_client_;