EME: Address TODOs related to the removal of prefixed EME

chrome/browser/chromeos/attestation/platform_verification_flow.cc

Index: chrome/browser/chromeos/attestation/platform_verification_flow.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
index 2648a961a12342f655d27718ff4ff89dcc640236..16ce5ed27939faa39548803f41813ab4cf5e3c8f 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -200,8 +200,14 @@ void PlatformVerificationFlow::ChallengePlatformKey(
     return;
   }
 
-  // Note: The following two checks are also checked in GetPermissionStatus.
-  // Checking them here explicitly to report the correct error type.
+  // Note: The following checks are performed when use of the protected media
+  // identifier is indicated. The first two in GetPermissionStatus and the third
+  // in DecidePermission.
+  // In Chrome, the result of the first and third could have changed in the
+  // interim, but the mode cannot change.
+  // TODO(ddorwin): Share more code for the first two checks with
+  // ProtectedMediaIdentifierPermissionContext::
+  // IsProtectedMediaIdentifierEnabled().
 
   if (!IsAttestationAllowedByPolicy()) {
     VLOG(1) << "Platform verification not allowed by device policy.";
@@ -209,11 +215,8 @@ void PlatformVerificationFlow::ChallengePlatformKey(
     return;
   }
 
-  // TODO(xhwang): Change to DCHECK when prefixed EME support is removed.

[ddorwin, 2016/06/23 01:06:47]

See
https://codereview.chromium.org/1001723002/diff/20001/chrome/browser/chromeos....

-  // See http://crbug.com/249976
   if (!delegate_->IsInSupportedMode(web_contents)) {
-    VLOG(1) << "Platform verification denied because it's not supported in the "
-            << "current mode.";
+    NOTREACHED() << "Platform verification not supported in the current mode.";
     ReportError(callback, PLATFORM_NOT_VERIFIED);
     return;
   }