Add PlayerTracker and BrowserCdm interfaces.

media/base/browser_cdm_factory.h

Index: media/base/browser_cdm_factory.h
diff --git a/media/base/cdm_factory.h b/media/base/browser_cdm_factory.h
similarity index 72%
rename from media/base/cdm_factory.h
rename to media/base/browser_cdm_factory.h
index ccdefa72fd38fda93e70c07b47d3594eede37c30..2ded885b6554b4eaba37d2dc5e5e984a4a40d3e8 100644
--- a/media/base/cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_CDM_FACTORY_H_
-#define MEDIA_BASE_CDM_FACTORY_H_
+#ifndef MEDIA_BASE_BROWSER_CDM_FACTORY_H_
+#define MEDIA_BASE_BROWSER_CDM_FACTORY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "media/base/browser_cdm.h"

[damienv1, 2014/05/30 15:10:15]

Foward declaration for BrowserCdm ?

[xhwang, 2014/06/02 20:11:43]

Done.

 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"

[ddorwin, 2014/05/30 20:50:05]

When inheritance is broken, it will be odd to be using th CBs from this file for
another type. Will we duplicate them, move them, or something else?

[xhwang, 2014/06/02 20:11:43]

+jrummell

Shall we move the callbacks to a common place to be shared by MediaKeys and
BrwoserCdm impls? e.g. in media/base/cdm_common.h?

 
 namespace media {
 
-// Creates a CDM for |key_system|. Returns NULL if the CDM cannot be created.
+// Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
+// created.
 // TODO(xhwang): Add ifdef for IPC based CDM.
-scoped_ptr<MediaKeys> MEDIA_EXPORT
+scoped_ptr<BrowserCdm> MEDIA_EXPORT
     CreateBrowserCdm(const std::string& key_system,
                      const SessionCreatedCB& session_created_cb,
                      const SessionMessageCB& session_message_cb,
@@ -25,4 +27,4 @@ scoped_ptr<MediaKeys> MEDIA_EXPORT
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_CDM_FACTORY_H_
+#endif  // MEDIA_BASE_BROWSER_CDM_FACTORY_H_