Simplify/Cleanup MediaClient

chromecast/renderer/media/key_systems_cast.h

Index: chromecast/renderer/media/key_systems_cast.h
diff --git a/chromecast/renderer/key_systems_cast.h b/chromecast/renderer/media/key_systems_cast.h
similarity index 71%
rename from chromecast/renderer/key_systems_cast.h
rename to chromecast/renderer/media/key_systems_cast.h
index 5b524ed8188844f7bdae4dfd33d144ed0b794f75..1084827e5206f1e931a324c90a07c1de87dbdab2 100644
--- a/chromecast/renderer/key_systems_cast.h
+++ b/chromecast/renderer/media/key_systems_cast.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_
-#define CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_
+#ifndef CHROMECAST_RENDERER_MEDIA_KEY_SYSTEMS_CAST_H_
+#define CHROMECAST_RENDERER_MEDIA_KEY_SYSTEMS_CAST_H_
 
 #include <memory>
 #include <vector>
@@ -13,7 +13,7 @@ class KeySystemProperties;
 }
 
 namespace chromecast {
-namespace shell {
+namespace media {
 
 void AddChromecastKeySystems(
     std::vector<std::unique_ptr<::media::KeySystemProperties>>*
@@ -21,7 +21,7 @@ void AddChromecastKeySystems(
     bool enable_persistent_license_support,
     bool force_software_crypto);
 
-}  // namespace shell
+}  // namespace media
 }  // namespace chromecast
 
-#endif  // CHROMECAST_RENDERER_KEY_SYSTEMS_CAST_H_
+#endif  // CHROMECAST_RENDERER_MEDIA_KEY_SYSTEMS_CAST_H_