Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

components/html_viewer/media_factory.h

Index: components/html_viewer/media_factory.h
diff --git a/components/html_viewer/media_factory.h b/components/html_viewer/media_factory.h
index 61a428ab307cb7c1ff92cd433c38e3b141b8f97c..8ee29ea3455e794fa383d546a695106ecdbcfaf3 100644
--- a/components/html_viewer/media_factory.h
+++ b/components/html_viewer/media_factory.h
@@ -41,13 +41,8 @@ class WebEncryptedMediaClientImpl;
 }
 
 namespace mojo {
-class ServiceProvider;
-namespace shell {
-namespace mojom {
 class Shell;
 }
-}
-}
 
 namespace html_viewer {
 
@@ -58,7 +53,7 @@ class MediaFactory {
  public:
   MediaFactory(
       const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
-      mojo::shell::mojom::Shell* shell);
+      mojo::Shell* shell);
   ~MediaFactory();
 
   blink::WebMediaPlayer* CreateMediaPlayer(
@@ -67,7 +62,7 @@ class MediaFactory {
       blink::WebMediaPlayerClient* client,
       blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
       blink::WebContentDecryptionModule* initial_cdm,
-      mojo::shell::mojom::Shell* shell);
+      mojo::Shell* shell);
 
   blink::WebEncryptedMediaClient* GetEncryptedMediaClient();
 
@@ -89,7 +84,7 @@ class MediaFactory {
 
   const bool enable_mojo_media_renderer_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
-  mojo::shell::mojom::Shell* shell_;
+  mojo::Shell* shell_;
 
   // Lazily initialized objects.
   media::interfaces::ServiceFactoryPtr media_service_factory_;