media: Rename SessionError to LegacySessionError.

Generated using sed:

OnSessionError -> OnLegacySessionError
SessionErrorCB -> LegacySessionErrorCB
session_error_cb -> legacy_session_error_cb

TBR=dcheng@chromium.org,isherman@chromium.org
BUG=448818

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

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

21 files changed, 102 insertions, 104 deletions

diff --git a/media/base/android/browser_cdm_factory_android.cc b/media/base/android/browser_cdm_factory_android.cc
index 43f586f..475af4c 100644
--- a/media/base/android/browser_cdm_factory_android.cc
+++ b/media/base/android/browser_cdm_factory_android.cc
@@ -18,7 +18,7 @@ scoped_ptr<BrowserCdm> BrowserCdmFactoryAndroid::CreateBrowserCdm(
     bool use_secure_surface,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
-    const SessionErrorCB& session_error_cb,
+    const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb) {
   if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
@@ -26,9 +26,10 @@ scoped_ptr<BrowserCdm> BrowserCdmFactoryAndroid::CreateBrowserCdm(
     return scoped_ptr<BrowserCdm>();
   }
 
-  scoped_ptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(
-      key_system, session_message_cb, session_closed_cb, session_error_cb,
-      session_keys_change_cb, session_expiration_update_cb));
+  scoped_ptr<MediaDrmBridge> cdm(
+      MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb,
+                             legacy_session_error_cb, session_keys_change_cb,
+                             session_expiration_update_cb));
   if (!cdm) {
     NOTREACHED() << "MediaDrmBridge cannot be created for " << key_system;
     return scoped_ptr<BrowserCdm>();
diff --git a/media/base/android/browser_cdm_factory_android.h b/media/base/android/browser_cdm_factory_android.h
index 17c61f7..4f83432 100644
--- a/media/base/android/browser_cdm_factory_android.h
+++ b/media/base/android/browser_cdm_factory_android.h
@@ -21,7 +21,7 @@ class MEDIA_EXPORT BrowserCdmFactoryAndroid : public BrowserCdmFactory {
       bool use_secure_surface,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
-      const SessionErrorCB& session_error_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb) final;
 
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index 65ce4fc..0e31818 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -348,12 +348,12 @@ MediaDrmBridge::MediaDrmBridge(
     const std::vector<uint8>& scheme_uuid,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
-    const SessionErrorCB& session_error_cb,
+    const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb)
     : scheme_uuid_(scheme_uuid),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
-      session_error_cb_(session_error_cb),
+      legacy_session_error_cb_(legacy_session_error_cb),
       session_keys_change_cb_(session_keys_change_cb) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
@@ -377,7 +377,7 @@ scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
     const std::string& key_system,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
-    const SessionErrorCB& session_error_cb,
+    const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& /* session_expiration_update_cb */) {
   scoped_ptr<MediaDrmBridge> media_drm_bridge;
@@ -388,9 +388,9 @@ scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
   if (scheme_uuid.empty())
     return media_drm_bridge.Pass();
 
-  media_drm_bridge.reset(new MediaDrmBridge(scheme_uuid, session_message_cb,
-                                            session_closed_cb, session_error_cb,
-                                            session_keys_change_cb));
+  media_drm_bridge.reset(
+      new MediaDrmBridge(scheme_uuid, session_message_cb, session_closed_cb,
+                         legacy_session_error_cb, session_keys_change_cb));
 
   if (media_drm_bridge->j_media_drm_.is_null())
     media_drm_bridge.reset();
@@ -402,7 +402,7 @@ scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
 scoped_ptr<MediaDrmBridge> MediaDrmBridge::CreateWithoutSessionSupport(
     const std::string& key_system) {
   return MediaDrmBridge::Create(
-      key_system, SessionMessageCB(), SessionClosedCB(), SessionErrorCB(),
+      key_system, SessionMessageCB(), SessionClosedCB(), LegacySessionErrorCB(),
       SessionKeysChangeCB(), SessionExpirationUpdateCB());
 }
 
@@ -625,8 +625,8 @@ void MediaDrmBridge::OnLegacySessionError(JNIEnv* env,
                                           jbyteArray j_session_id,
                                           jstring j_error_message) {
   std::string error_message = ConvertJavaStringToUTF8(env, j_error_message);
-  session_error_cb_.Run(GetSessionId(env, j_session_id),
-                        MediaKeys::UNKNOWN_ERROR, 0, error_message);
+  legacy_session_error_cb_.Run(GetSessionId(env, j_session_id),
+                               MediaKeys::UNKNOWN_ERROR, 0, error_message);
 }
 
 ScopedJavaLocalRef<jobject> MediaDrmBridge::GetMediaCrypto() {
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index a1ca70d..b767aa6 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -65,7 +65,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
       const std::string& key_system,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
-      const SessionErrorCB& session_error_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb);
 
@@ -184,7 +184,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
   MediaDrmBridge(const std::vector<uint8>& scheme_uuid,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
-                 const SessionErrorCB& session_error_cb,
+                 const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb);
 
   static bool IsSecureDecoderRequired(SecurityLevel security_level);
@@ -201,7 +201,7 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
-  SessionErrorCB session_error_cb_;
+  LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
 
   base::Closure media_crypto_ready_cb_;
diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc
index 46e96f5..ac0894f 100644
--- a/media/base/browser_cdm_factory.cc
+++ b/media/base/browser_cdm_factory.cc
@@ -26,7 +26,7 @@ scoped_ptr<BrowserCdm> CreateBrowserCdm(
     bool use_secure_surface,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
-    const SessionErrorCB& session_error_cb,
+    const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb) {
   if (!g_cdm_factory) {
@@ -40,7 +40,8 @@ scoped_ptr<BrowserCdm> CreateBrowserCdm(
 
   return g_cdm_factory->CreateBrowserCdm(
       key_system, use_secure_surface, session_message_cb, session_closed_cb,
-      session_error_cb, session_keys_change_cb, session_expiration_update_cb);
+      legacy_session_error_cb, session_keys_change_cb,
+      session_expiration_update_cb);
 }
 
 }  // namespace media
diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index ecce0be..b2ff0c7 100644
--- a/media/base/browser_cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -24,7 +24,7 @@ class MEDIA_EXPORT BrowserCdmFactory {
       bool use_secure_surface,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
-      const SessionErrorCB& session_error_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb) = 0;
 
@@ -46,7 +46,7 @@ CreateBrowserCdm(const std::string& key_system,
                  bool use_secure_surface,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
-                 const SessionErrorCB& session_error_cb,
+                 const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb);
 
diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h
index 918e623..2a9b42d 100644
--- a/media/base/cdm_factory.h
+++ b/media/base/cdm_factory.h
@@ -27,7 +27,7 @@ class MEDIA_EXPORT CdmFactory {
       const GURL& security_origin,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
-      const SessionErrorCB& session_error_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb) = 0;
 
diff --git a/media/base/media_keys.h b/media/base/media_keys.h
index e9fb93c..796d78d 100644
--- a/media/base/media_keys.h
+++ b/media/base/media_keys.h
@@ -164,7 +164,8 @@ typedef base::Callback<void(const std::string& session_id)> SessionClosedCB;
 typedef base::Callback<void(const std::string& session_id,
                             MediaKeys::Exception exception,
                             uint32 system_code,
-                            const std::string& error_message)> SessionErrorCB;
+                            const std::string& error_message)>
+    LegacySessionErrorCB;
 
 typedef base::Callback<void(const std::string& session_id,
                             bool has_additional_usable_key,
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index c77efb7..79f5054 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -41,7 +41,7 @@ bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,
       security_origin,
       base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
-      base::Bind(&CdmSessionAdapter::OnSessionError, weak_this),
+      base::Bind(&CdmSessionAdapter::OnLegacySessionError, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this),
       base::Bind(&CdmSessionAdapter::OnSessionExpirationUpdate, weak_this));
   return media_keys_.get() != nullptr;
@@ -163,10 +163,11 @@ void CdmSessionAdapter::OnSessionClosed(const std::string& session_id) {
     session->OnSessionClosed();
 }
 
-void CdmSessionAdapter::OnSessionError(const std::string& session_id,
-                                       MediaKeys::Exception exception_code,
-                                       uint32 system_code,
-                                       const std::string& error_message) {
+void CdmSessionAdapter::OnLegacySessionError(
+    const std::string& session_id,
+    MediaKeys::Exception exception_code,
+    uint32 system_code,
+    const std::string& error_message) {
   // Error events not used by unprefixed EME.
   // TODO(jrummell): Remove when prefixed EME removed.
 }
diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h
index f806ee8..e35c4cb 100644
--- a/media/blink/cdm_session_adapter.h
+++ b/media/blink/cdm_session_adapter.h
@@ -116,10 +116,10 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   void OnSessionExpirationUpdate(const std::string& session_id,
                                  const base::Time& new_expiry_time);
   void OnSessionClosed(const std::string& session_id);
-  void OnSessionError(const std::string& session_id,
-                      MediaKeys::Exception exception_code,
-                      uint32 system_code,
-                      const std::string& error_message);
+  void OnLegacySessionError(const std::string& session_id,
+                            MediaKeys::Exception exception_code,
+                            uint32 system_code,
+                            const std::string& error_message);
 
   // Helper function of the callbacks.
   WebContentDecryptionModuleSessionImpl* GetSession(
diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc
index 94aae93..9d8ea83 100644
--- a/media/cdm/default_cdm_factory.cc
+++ b/media/cdm/default_cdm_factory.cc
@@ -22,7 +22,7 @@ scoped_ptr<MediaKeys> DefaultCdmFactory::Create(
     const GURL& security_origin,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
-    const SessionErrorCB& session_error_cb,
+    const LegacySessionErrorCB& legacy_session_error_cb,
     const SessionKeysChangeCB& session_keys_change_cb,
     const SessionExpirationUpdateCB& session_expiration_update_cb) {
   if (CanUseAesDecryptor(key_system)) {
diff --git a/media/cdm/default_cdm_factory.h b/media/cdm/default_cdm_factory.h
index d9528808..72e0e8d 100644
--- a/media/cdm/default_cdm_factory.h
+++ b/media/cdm/default_cdm_factory.h
@@ -23,7 +23,7 @@ class DefaultCdmFactory : public CdmFactory {
       const GURL& security_origin,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
-      const SessionErrorCB& session_error_cb,
+      const LegacySessionErrorCB& legacy_session_error_cb,
       const SessionKeysChangeCB& session_keys_change_cb,
       const SessionExpirationUpdateCB& session_expiration_update_cb) final;
 
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index db7b38d..1d765d0 100644
--- a/media/cdm/ppapi/cdm_adapter.cc
+++ b/media/cdm/ppapi/cdm_adapter.cc
@@ -862,7 +862,7 @@ void CdmAdapter::SendSessionErrorInternal(int32_t result,
                                           const std::string& session_id,
                                           const SessionError& error) {
   PP_DCHECK(result == PP_OK);
-  pp::ContentDecryptor_Private::SessionError(
+  pp::ContentDecryptor_Private::LegacySessionError(
       session_id, CdmExceptionTypeToPpCdmExceptionType(error.error),
       error.system_code, error.error_description);
 }
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index 75013bf..b9f3b78 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -99,14 +99,12 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& init_data_type,
     StripHeader(init_data_vector, strlen(kPrefixedApiPersistentSessionHeader));
   }
 
-  scoped_ptr<NewSessionCdmPromise> promise(
-      new CdmCallbackPromise<std::string>(
-          base::Bind(&ProxyDecryptor::SetSessionId,
-                     weak_ptr_factory_.GetWeakPtr(),
-                     session_creation_type),
-          base::Bind(&ProxyDecryptor::OnSessionError,
-                     weak_ptr_factory_.GetWeakPtr(),
-                     std::string())));  // No session id until created.
+  scoped_ptr<NewSessionCdmPromise> promise(new CdmCallbackPromise<std::string>(
+      base::Bind(&ProxyDecryptor::SetSessionId, weak_ptr_factory_.GetWeakPtr(),
+                 session_creation_type),
+      base::Bind(&ProxyDecryptor::OnLegacySessionError,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 std::string())));  // No session id until created.
 
   if (session_creation_type == LoadSession) {
     media_keys_->LoadSession(
@@ -178,10 +176,8 @@ void ProxyDecryptor::AddKey(const uint8* key,
       base::hash_map<std::string, bool>::iterator it = active_sessions_.begin();
       new_session_id = it->first;
     } else {
-      OnSessionError(std::string(),
-                     MediaKeys::NOT_SUPPORTED_ERROR,
-                     0,
-                     "SessionId not specified.");
+      OnLegacySessionError(std::string(), MediaKeys::NOT_SUPPORTED_ERROR, 0,
+                           "SessionId not specified.");
       return;
     }
   }
@@ -189,7 +185,7 @@ void ProxyDecryptor::AddKey(const uint8* key,
   scoped_ptr<SimpleCdmPromise> promise(new CdmCallbackPromise<>(
       base::Bind(&ProxyDecryptor::GenerateKeyAdded,
                  weak_ptr_factory_.GetWeakPtr(), session_id),
-      base::Bind(&ProxyDecryptor::OnSessionError,
+      base::Bind(&ProxyDecryptor::OnLegacySessionError,
                  weak_ptr_factory_.GetWeakPtr(), session_id)));
 
   // EME WD spec only supports a single array passed to the CDM. For
@@ -223,7 +219,7 @@ void ProxyDecryptor::CancelKeyRequest(const std::string& session_id) {
   scoped_ptr<SimpleCdmPromise> promise(new CdmCallbackPromise<>(
       base::Bind(&ProxyDecryptor::OnSessionClosed,
                  weak_ptr_factory_.GetWeakPtr(), session_id),
-      base::Bind(&ProxyDecryptor::OnSessionError,
+      base::Bind(&ProxyDecryptor::OnLegacySessionError,
                  weak_ptr_factory_.GetWeakPtr(), session_id)));
   media_keys_->RemoveSession(session_id, promise.Pass());
 }
@@ -239,13 +235,10 @@ scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
   bool allow_persistent_state = true;
   base::WeakPtr<ProxyDecryptor> weak_this = weak_ptr_factory_.GetWeakPtr();
   return cdm_factory->Create(
-      key_system,
-      allow_distinctive_identifier,
-      allow_persistent_state,
-      security_origin,
-      base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
+      key_system, allow_distinctive_identifier, allow_persistent_state,
+      security_origin, base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
-      base::Bind(&ProxyDecryptor::OnSessionError, weak_this),
+      base::Bind(&ProxyDecryptor::OnLegacySessionError, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionExpirationUpdate, weak_this));
 }
@@ -303,17 +296,17 @@ void ProxyDecryptor::OnSessionClosed(const std::string& session_id) {
     return;
 
   if (it->second) {
-    OnSessionError(session_id, MediaKeys::NOT_SUPPORTED_ERROR,
-                   kSessionClosedSystemCode,
-                   "Do not close persistent sessions.");
+    OnLegacySessionError(session_id, MediaKeys::NOT_SUPPORTED_ERROR,
+                         kSessionClosedSystemCode,
+                         "Do not close persistent sessions.");
   }
   active_sessions_.erase(it);
 }
 
-void ProxyDecryptor::OnSessionError(const std::string& session_id,
-                                    MediaKeys::Exception exception_code,
-                                    uint32 system_code,
-                                    const std::string& error_message) {
+void ProxyDecryptor::OnLegacySessionError(const std::string& session_id,
+                                          MediaKeys::Exception exception_code,
+                                          uint32 system_code,
+                                          const std::string& error_message) {
   // Convert |error_name| back to MediaKeys::KeyError if possible. Prefixed
   // EME has different error message, so all the specific error events will
   // get lost.
diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h
index e3a3fe4..16c2f92 100644
--- a/media/cdm/proxy_decryptor.h
+++ b/media/cdm/proxy_decryptor.h
@@ -83,10 +83,10 @@ class MEDIA_EXPORT ProxyDecryptor {
                                  const base::Time& new_expiry_time);
   void GenerateKeyAdded(const std::string& session_id);
   void OnSessionClosed(const std::string& session_id);
-  void OnSessionError(const std::string& session_id,
-                      MediaKeys::Exception exception_code,
-                      uint32 system_code,
-                      const std::string& error_message);
+  void OnLegacySessionError(const std::string& session_id,
+                            MediaKeys::Exception exception_code,
+                            uint32 system_code,
+                            const std::string& error_message);
 
   // Callback for permission request.
   void OnPermissionStatus(MediaKeys::SessionType session_type,
diff --git a/media/mojo/interfaces/content_decryption_module.mojom b/media/mojo/interfaces/content_decryption_module.mojom
index 65afab3..24d4072 100644
--- a/media/mojo/interfaces/content_decryption_module.mojom
+++ b/media/mojo/interfaces/content_decryption_module.mojom
@@ -132,8 +132,8 @@ interface ContentDecryptionModuleClient {
 
   OnSessionClosed(string session_id);
 
-  OnSessionError(string session_id, CdmException exception,
-                 uint32 system_code, string error_message);
+  OnLegacySessionError(string session_id, CdmException exception,
+                       uint32 system_code, string error_message);
 
   OnSessionKeysChange(string session_id, bool has_additional_usable_key,
                       array<CdmKeyInformation> key_information);
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 58236d8..df82ec9 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -35,21 +35,21 @@ static void RejectPromise(scoped_ptr<PromiseType> promise,
 MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
-                 const SessionErrorCB& session_error_cb,
+                 const LegacySessionErrorCB& legacy_session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb)
     : remote_cdm_(remote_cdm.Pass()),
       binding_(this),
       session_message_cb_(session_message_cb),
       session_closed_cb_(session_closed_cb),
-      session_error_cb_(session_error_cb),
+      legacy_session_error_cb_(legacy_session_error_cb),
       session_keys_change_cb_(session_keys_change_cb),
       session_expiration_update_cb_(session_expiration_update_cb),
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!session_message_cb_.is_null());
   DCHECK(!session_closed_cb_.is_null());
-  DCHECK(!session_error_cb_.is_null());
+  DCHECK(!legacy_session_error_cb_.is_null());
   DCHECK(!session_keys_change_cb_.is_null());
   DCHECK(!session_expiration_update_cb_.is_null());
 
@@ -144,13 +144,13 @@ void MojoCdm::OnSessionClosed(const mojo::String& session_id) {
   session_closed_cb_.Run(session_id);
 }
 
-void MojoCdm::OnSessionError(const mojo::String& session_id,
-                             mojo::CdmException exception,
-                             uint32_t system_code,
-                             const mojo::String& error_message) {
-  session_error_cb_.Run(session_id,
-                        static_cast<MediaKeys::Exception>(exception),
-                        system_code, error_message);
+void MojoCdm::OnLegacySessionError(const mojo::String& session_id,
+                                   mojo::CdmException exception,
+                                   uint32_t system_code,
+                                   const mojo::String& error_message) {
+  legacy_session_error_cb_.Run(session_id,
+                               static_cast<MediaKeys::Exception>(exception),
+                               system_code, error_message);
 }
 
 void MojoCdm::OnSessionKeysChange(
diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h
index 53d494f..4c29577 100644
--- a/media/mojo/services/mojo_cdm.h
+++ b/media/mojo/services/mojo_cdm.h
@@ -27,7 +27,7 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
   MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
-          const SessionErrorCB& session_error_cb,
+          const LegacySessionErrorCB& legacy_session_error_cb,
           const SessionKeysChangeCB& session_keys_change_cb,
           const SessionExpirationUpdateCB& session_expiration_update_cb);
   ~MojoCdm() final;
@@ -62,10 +62,10 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
                         mojo::Array<uint8_t> message,
                         const mojo::String& legacy_destination_url) final;
   void OnSessionClosed(const mojo::String& session_id) final;
-  void OnSessionError(const mojo::String& session_id,
-                      mojo::CdmException exception,
-                      uint32_t system_code,
-                      const mojo::String& error_message) final;
+  void OnLegacySessionError(const mojo::String& session_id,
+                            mojo::CdmException exception,
+                            uint32_t system_code,
+                            const mojo::String& error_message) final;
   void OnSessionKeysChange(
       const mojo::String& session_id,
       bool has_additional_usable_key,
@@ -93,7 +93,7 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
-  SessionErrorCB session_error_cb_;
+  LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index b278189..eff147f 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -143,13 +143,13 @@ void MojoCdmService::OnSessionClosed(const std::string& session_id) {
   client_->OnSessionClosed(session_id);
 }
 
-void MojoCdmService::OnSessionError(const std::string& session_id,
-                                    MediaKeys::Exception exception,
-                                    uint32_t system_code,
-                                    const std::string& error_message) {
-  client_->OnSessionError(session_id,
-                          static_cast<mojo::CdmException>(exception),
-                          system_code, error_message);
+void MojoCdmService::OnLegacySessionError(const std::string& session_id,
+                                          MediaKeys::Exception exception,
+                                          uint32_t system_code,
+                                          const std::string& error_message) {
+  client_->OnLegacySessionError(session_id,
+                                static_cast<mojo::CdmException>(exception),
+                                system_code, error_message);
 }
 
 }  // namespace media
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index ff30e9b..a1b1ea0 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -62,10 +62,10 @@ class MojoCdmService
   void OnSessionExpirationUpdate(const std::string& session_id,
                                  const base::Time& new_expiry_time);
   void OnSessionClosed(const std::string& session_id);
-  void OnSessionError(const std::string& session_id,
-                      MediaKeys::Exception exception,
-                      uint32_t system_code,
-                      const std::string& error_message);
+  void OnLegacySessionError(const std::string& session_id,
+                            MediaKeys::Exception exception,
+                            uint32_t system_code,
+                            const std::string& error_message);
 
   scoped_ptr<MediaKeys> cdm_;
 
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 5042160..118f1f7 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -158,10 +158,10 @@ class FakeEncryptedMedia {
                                      CdmKeysInfo keys_info) = 0;
 
     // Errors are not expected unless overridden.
-    virtual void OnSessionError(const std::string& session_id,
-                                const std::string& error_name,
-                                uint32 system_code,
-                                const std::string& error_message) {
+    virtual void OnLegacySessionError(const std::string& session_id,
+                                      const std::string& error_name,
+                                      uint32 system_code,
+                                      const std::string& error_message) {
       FAIL() << "Unexpected Key Error";
     }
 
@@ -202,11 +202,12 @@ class FakeEncryptedMedia {
                               keys_info.Pass());
   }
 
-  void OnSessionError(const std::string& session_id,
-                      const std::string& error_name,
-                      uint32 system_code,
-                      const std::string& error_message) {
-    app_->OnSessionError(session_id, error_name, system_code, error_message);
+  void OnLegacySessionError(const std::string& session_id,
+                            const std::string& error_name,
+                            uint32 system_code,
+                            const std::string& error_message) {
+    app_->OnLegacySessionError(session_id, error_name, system_code,
+                               error_message);
   }
 
   void OnEncryptedMediaInitData(const std::string& init_data_type,