Introduce CdmFactory interface.

content/renderer/media/cdm_session_adapter.cc

 // Copyright 2014 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.
 
 #include "content/renderer/media/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
-#include "content/renderer/media/crypto/content_decryption_module_factory.h"
 #include "content/renderer/media/crypto/key_systems.h"
 #include "content/renderer/media/webcontentdecryptionmodulesession_impl.h"
+#include "media/base/cdm_factory.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
+#if defined(ENABLE_BROWSER_CDMS)
+#include "content/renderer/media/crypto/renderer_cdm_manager.h"
+#endif  // defined(ENABLE_BROWSER_CDMS)
+
 namespace content {
 
 const char kMediaEME[] = "Media.EME.";
 const char kDot[] = ".";
 
 CdmSessionAdapter::CdmSessionAdapter() :
 #if defined(ENABLE_BROWSER_CDMS)
-    cdm_id_(0),
+    // TODO(xhwang): Move kInvalidCdmId to src/media.
+    cdm_id_(RendererCdmManager::kInvalidCdmId),
 #endif
     weak_ptr_factory_(this) {}
 
 CdmSessionAdapter::~CdmSessionAdapter() {}
 
-bool CdmSessionAdapter::Initialize(
-#if defined(ENABLE_PEPPER_CDMS)
-    const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(ENABLE_BROWSER_CDMS)
-    RendererCdmManager* manager,
-#endif  // defined(ENABLE_PEPPER_CDMS)
-    const std::string& key_system,
-    const GURL& security_origin) {
+bool CdmSessionAdapter::Initialize(scoped_ptr<media::CdmFactory> cdm_factory,

[ddorwin, 2014/10/16 17:32:51]

It seems odd to pass ownership of a factory. It forces the caller to create a
new factory for each call, regardless of what makes sense. Since this function
is synchronous, we could pass a pointer and have the caller decide whether to
destroy it or not.

[xhwang, 2014/10/16 20:08:39]

Good point. Done.

Currently we are still creating a new factory every time we create a new CDM,
this is because the |frame| is passed from Blink. We could have a
set_frame(frame) function on RenderCdmFactory, but since this is a simple class,
I am not sure whether it's worth it.

+                                   const std::string& key_system,
+                                   const GURL& security_origin) {
+  // TODO(xhwang): This is why we need to include "key_systems.h". Move
+  // KeySystemNameForUMA out of src/content so we can move CdmSessionAdapter to

[ddorwin, 2014/10/16 17:32:51]

We probably need to inject the key systems into media/.
UMA name is currently a special case, but I think we can replace the hard-coding
and use the same mechanism we use for adding other key system info.

[xhwang, 2014/10/16 20:08:39]

Acknowledged.

+  // src/media.
   key_system_uma_prefix_ = kMediaEME + KeySystemNameForUMA(key_system) + kDot;
+
   base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();
-  media_keys_ = ContentDecryptionModuleFactory::Create(
+  media_keys_ = cdm_factory->Create(
       key_system,
       security_origin,
-#if defined(ENABLE_PEPPER_CDMS)
-      create_pepper_cdm_cb,
-#elif defined(ENABLE_BROWSER_CDMS)
-      manager,
+#if defined(ENABLE_BROWSER_CDMS)

[ddorwin, 2014/10/16 17:32:51]

We've eliminated other ifdef's. Can we eliminate this  eventually?

[xhwang, 2014/10/16 20:08:39]

Totally agreed. I am thinking about it...

This is the history:
https://codereview.chromium.org/193523002/diff/1/media/base/media_keys.h#newc...

How about reintroduce GetCdmId() to MediaKeys, but put it in the #if
defined(ENABLE_BROWSER_CDMS)?

[ddorwin, 2014/10/16 20:33:20]

Sounds good. Please make a separate CL after this lands so we can see how the
footprint changes.

[xhwang, 2014/10/17 00:11:48]

Acknowledged.

       &cdm_id_,
 #endif  // defined(ENABLE_PEPPER_CDMS)
       base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionReady, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionError, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionExpirationUpdate, weak_this));
 
   // Success if |media_keys_| created.
@@ skipping 148 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     const std::string& web_session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(web_session_id);
   return (session != sessions_.end()) ? session->second.get() : NULL;
 }
 
 }  // namespace content