Delete media::Interfaces::ServiceFactory.

content/renderer/render_frame_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 35 matching lines @@
 #include "ui/gfx/range/range.h"
 
 #if defined(ENABLE_PLUGINS)
 #include "content/renderer/pepper/plugin_power_saver_helper.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 #endif
 
-#if defined(ENABLE_MOJO_MEDIA)
-#include "media/mojo/interfaces/service_factory.mojom.h"
-#endif
-
 class GURL;
 class TransportDIB;
 struct FrameMsg_NewFrame_WidgetParams;
 struct FrameMsg_PostMessage_Params;
 struct FrameMsg_TextTrackSettings_Params;
 
 namespace blink {
 class WebGeolocationClient;
 class WebMouseEvent;
 class WebContentDecryptionModule;
@@ skipping 847 matching lines @@
   RendererMediaPlayerManager* GetMediaPlayerManager();
 
   RendererMediaSessionManager* GetMediaSessionManager();
 #endif
 
   bool AreSecureCodecsSupported();
 
   media::MediaPermission* GetMediaPermission();
 
 #if defined(ENABLE_MOJO_MEDIA)
-  media::interfaces::ServiceFactory* GetMediaServiceFactory();
-
-  // Called when a connection error happened on |media_service_factory_|.
-  void OnMediaServiceFactoryConnectionError();
+  mojo::ServiceProvider* GetMediaServiceProvider();
 #endif
 
   media::CdmFactory* GetCdmFactory();
 
   void RegisterMojoServices();
 
   // Connects to a Mojo application and returns a proxy to its exposed
   // ServiceProvider.
   mojo::ServiceProviderPtr ConnectToApplication(const GURL& url);
 
@@ skipping 117 matching lines @@
   UserMediaClientImpl* web_user_media_client_;
 
   // EncryptedMediaClient attached to this frame; lazily initialized.
   scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
 
   // The media permission dispatcher attached to this frame, lazily initialized.
   MediaPermissionDispatcherImpl* media_permission_dispatcher_;
 
 #if defined(ENABLE_MOJO_MEDIA)
   // The media factory attached to this frame, lazily initialized.
-  media::interfaces::ServiceFactoryPtr media_service_factory_;
+  mojo::ServiceProviderPtr media_service_provider_;
 #endif
 
   // MidiClient attached to this frame; lazily initialized.
   MidiDispatcher* midi_dispatcher_;
 
 #if defined(OS_ANDROID)
   // Manages all media players and sessions in this render frame for
   // communicating with the real media player and sessions in the
   // browser process. It's okay to use raw pointers since they're both
   // RenderFrameObservers.
@@ skipping 85 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_