Simplify/Cleanup MediaClient

chromecast/renderer/media/key_systems_cast.cc

 // 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 "chromecast/renderer/key_systems_cast.h"
+#include "chromecast/renderer/media/key_systems_cast.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chromecast/media/base/key_systems_common.h"
 #include "components/cdm/renderer/android_key_systems.h"
 #include "components/cdm/renderer/widevine_key_system_properties.h"
 #include "media/base/eme_constants.h"
 #include "media/base/key_system_properties.h"
 #include "media/media_features.h"
 
-#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
+#include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 using ::media::EmeConfigRule;
 using ::media::EmeFeatureSupport;
 using ::media::EmeInitDataType;
 using ::media::EmeMediaType;
 using ::media::EmeSessionTypeSupport;
 using ::media::SupportedCodecs;
 
 namespace chromecast {
-namespace shell {
+namespace media {
 namespace {
 
 #if defined(PLAYREADY_CDM_AVAILABLE)
 class PlayReadyKeySystemProperties : public ::media::KeySystemProperties {
  public:
   explicit PlayReadyKeySystemProperties(bool persistent_license_support)
-      : persistent_license_support_(persistent_license_support) {
-  }
+      : persistent_license_support_(persistent_license_support) {}
 
   std::string GetKeySystemName() const override {
     return media::kChromecastPlayreadyKeySystem;
   }
 
   bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override {
     return init_data_type == EmeInitDataType::CENC;
   }
 
   SupportedCodecs GetSupportedCodecs() const override {
     SupportedCodecs codecs =
         ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     codecs |= ::media::EME_CODEC_MP4_HEVC;
 #endif
     return codecs;
   }
 
   EmeConfigRule GetRobustnessConfigRule(
       EmeMediaType media_type,
       const std::string& requested_robustness) const override {
     return requested_robustness.empty() ? EmeConfigRule::SUPPORTED
                                         : EmeConfigRule::NOT_SUPPORTED;
   }
 
   EmeSessionTypeSupport GetPersistentLicenseSessionSupport() const override {
     return persistent_license_support_ ? EmeSessionTypeSupport::SUPPORTED
-        : EmeSessionTypeSupport::NOT_SUPPORTED;
+                                       : EmeSessionTypeSupport::NOT_SUPPORTED;
   }
 
   EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
       const override {
     return EmeSessionTypeSupport::NOT_SUPPORTED;
   }
 
   EmeFeatureSupport GetPersistentStateSupport() const override {
     return EmeFeatureSupport::ALWAYS_ENABLED;
   }
@@ skipping 30 matching lines @@
 #else
   using Robustness = cdm::WidevineKeySystemProperties::Robustness;
   ::media::SupportedCodecs codecs =
       ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
       ::media::EME_CODEC_MP4_VP9 | ::media::EME_CODEC_WEBM_VP8 |
       ::media::EME_CODEC_WEBM_VP9;
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
   codecs |= ::media::EME_CODEC_MP4_HEVC;
 #endif
   key_systems_properties->emplace_back(new cdm::WidevineKeySystemProperties(
-      codecs,  // Regular codecs.
+      codecs,                     // Regular codecs.
       Robustness::HW_SECURE_ALL,  // Max audio robustness.
       Robustness::HW_SECURE_ALL,  // Max video robustness.
       enable_persistent_license_support
           ? EmeSessionTypeSupport::SUPPORTED
           : EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
       EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
       // Note: On Chromecast, all CDMs may have persistent state.
       EmeFeatureSupport::ALWAYS_ENABLED,    // Persistent state.
       EmeFeatureSupport::ALWAYS_ENABLED));  // Distinctive identifier.
 #endif  // defined(OS_ANDROID)
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 }
 
-}  // namespace shell
+}  // namespace media
 }  // namespace chromecast