Move MediaKeys::Exception to CdmPromise::Exception

media/remoting/rpc/proto_enum_utils.cc

 // Copyright 2016 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 "media/remoting/rpc/proto_enum_utils.h"
 
 namespace media {
 namespace remoting {
 
 #define CASE_RETURN_OTHER(x) \
@@ skipping 411 matching lines @@
     CASE_RETURN_OTHER(INTERNAL_ERROR);
     CASE_RETURN_OTHER(EXPIRED);
     CASE_RETURN_OTHER(OUTPUT_RESTRICTED);
     CASE_RETURN_OTHER(OUTPUT_DOWNSCALED);
     CASE_RETURN_OTHER(KEY_STATUS_PENDING);
     CASE_RETURN_OTHER(RELEASED);
   }
   return base::nullopt;  // Not a 'default' to ensure compile-time checks.
 }
 
-base::Optional<::media::MediaKeys::Exception> ToMediaMediaKeysException(
+base::Optional<::media::CdmPromise::Exception> ToCdmPromiseException(
     pb::MediaKeysException value) {
   using OriginType = pb::MediaKeysException;
-  using OtherType = ::media::MediaKeys;
+  using OtherType = ::media::CdmPromise;
   switch (value) {
     CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR);
     CASE_RETURN_OTHER(INVALID_STATE_ERROR);
     CASE_RETURN_OTHER(INVALID_ACCESS_ERROR);
     CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR);
     CASE_RETURN_OTHER(UNKNOWN_ERROR);
     CASE_RETURN_OTHER(CLIENT_ERROR);
     CASE_RETURN_OTHER(OUTPUT_ERROR);
   }
   return base::nullopt;  // Not a 'default' to ensure compile-time checks.
 }
 
 base::Optional<pb::MediaKeysException> ToProtoMediaKeysException(
-    ::media::MediaKeys::Exception value) {
-  using OriginType = ::media::MediaKeys;
+    ::media::CdmPromise::Exception value) {
+  using OriginType = ::media::CdmPromise;
   using OtherType = pb::MediaKeysException;
   switch (value) {
     CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR);
     CASE_RETURN_OTHER(INVALID_STATE_ERROR);
     CASE_RETURN_OTHER(INVALID_ACCESS_ERROR);
     CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR);
     CASE_RETURN_OTHER(UNKNOWN_ERROR);
     CASE_RETURN_OTHER(CLIENT_ERROR);
     CASE_RETURN_OTHER(OUTPUT_ERROR);
   }
@@ skipping 93 matching lines @@
   switch (value) {
     CASE_RETURN_OTHER(kOk);
     CASE_RETURN_OTHER(kAborted);
     CASE_RETURN_OTHER(kConfigChanged);
   }
   return base::nullopt;  // Not a 'default' to ensure compile-time checks.
 }
 
 }  // namespace remoting
 }  // namespace media