media: Remove BrowserCdmFactory inferface.

BrowserCdmFactory interface was introduced as the browser side factory to create
BrowserCdm. Now BrowserCdm has been merged into MediaKeys interface, this CL
merges BrowserCdmFactory into the more generic CdmFactory interface.

This CL also changes how BrowserCdmFactory is registered/created on Android and
on Cast.

With this CL, we use the same AndroidCdmFactory to create MediaDrmBridge when
it is hosted:
- in the browser process using BrowserCdmManager, or
- in the GPU process using MojoCdmService.

BUG=521731
TEST=Tested MediaDrmBridge creation in the browser and GPU process on Android.

Review URL: https://codereview.chromium.org/1408793009

Cr-Commit-Position: refs/heads/master@{#358390}

1 files changed, 1 insertions, 4 deletions

diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
index 11763b8b..12129e3 100644
--- a/chromecast/browser/cast_content_browser_client.h
+++ b/chromecast/browser/cast_content_browser_client.h
@@ -71,10 +71,6 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
   // instance.
   virtual scoped_refptr<media::CmaMediaPipelineClient>
   CreateCmaMediaPipelineClient();
-
-  // Creates and returns a factory used for creating BrowserCdm instances for
-  // playing protected content. This is called once per browser lifetime.
-  virtual scoped_ptr<::media::BrowserCdmFactory> CreateBrowserCdmFactory();
 #endif
 
   // Performs cleanup for process exit (but before AtExitManager cleanup).
@@ -150,6 +146,7 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
       content::FileDescriptorInfo* mappings,
       std::map<int, base::MemoryMappedFile::Region>* regions) override;
 #else
+  scoped_ptr<::media::CdmFactory> CreateCdmFactory() override;
   void GetAdditionalMappedFilesForChildProcess(
       const base::CommandLine& command_line,
       int child_process_id,