media: No longer treat empty robustness differently on ChromeOS

third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

 // 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 "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
@@ skipping 104 matching lines @@
     EncryptedMediaRequest::trace(visitor);
   }
 
  private:
   // Returns true if the ExecutionContext is valid, false otherwise.
   bool isExecutionContextValid() const;
 
   // For widevine key system, generate warning and report to UMA if
   // |m_supportedConfigurations| contains any video capability with empty
   // robustness string.
-  // TODO(xhwang): Remove after we handle empty robustness correctly.
-  // See http://crbug.com/482277
   void checkVideoCapabilityRobustness() const;
 
   // Generate deprecation warning and log UseCounter if configuration
   // contains only container-only contentType strings.
   // TODO(jrummell): Remove once this is no longer allowed.
   // See http://crbug.com/605661.
   void checkEmptyCodecs(const WebMediaKeySystemConfiguration&);
 
   // Log UseCounter if selected configuration does not have at least one of
   // 'audioCapabilities' and 'videoCapabilities' non-empty.
@@ skipping 120 matching lines @@
         EnumerationHistogram, emptyRobustnessHistogram,
         new EnumerationHistogram(
             "Media.EME.Widevine.VideoCapability.HasEmptyRobustness", 2));
     emptyRobustnessHistogram.count(hasEmptyRobustness);
   }
 
   if (hasEmptyRobustness) {
     m_resolver->getExecutionContext()->addConsoleMessage(ConsoleMessage::create(
         JSMessageSource, WarningMessageLevel,
         "It is recommended that a robustness level be specified. Not "
-        "specifying the robustness level could "
-        "result in unexpected behavior in the future, potentially including "
-        "failure to play."));
+        "specifying the robustness level could result in unexpected behavior, "
+        "potentially including failure to play."));
   }
 }
 
 void MediaKeySystemAccessInitializer::checkEmptyCodecs(
     const WebMediaKeySystemConfiguration& config) {
   // This is only checking for empty codecs in the selected configuration,
   // as apps may pass container only contentType strings for compatibility
   // with other implementations.
   // This will only check that all returned capabilities do not contain
   // codecs. This avoids alerting on configurations that will continue
@@ skipping 113 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink