media: Move CdmHostProxy to media/cdm/library_cdm

This class can be useful for any classes to implement/support multiple
versins of library CDM interface. Hence, move it out of clear_key_cdm
folder. In a later CL, I'll use them for a mock library CDM
implementation.

Bug: 836046
Test: No functionality change.
Change-Id: I7567e405de0251ddce3718eb76d102f07ff8f33e
Reviewed-on: https://chromium-review.googlesource.com/1026970Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553693}

media/cdm/library_cdm/BUILD.gn

+# Copyright 2018 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.
+
+import("//media/media_options.gni")
+
+if (enable_library_cdms) {
+  source_set("cdm_host_proxy") {
+    sources = [
+      "cdm_host_proxy.h",
+      "cdm_host_proxy_impl.h",
+    ]
+
+    deps = [
+      "//base",
+      "//media/cdm:cdm_api",
+    ]
+  }
+}

media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h → media/cdm/library_cdm/cdm_host_proxy.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 MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_H_
-#define MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_H_
+#ifndef MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_H_
+#define MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_H_
 
 #include "media/cdm/api/content_decryption_module.h"
 
@@ -60,4 +60,4 @@ class CdmHostProxy {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_H_
+#endif  // MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_H_

media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h → media/cdm/library_cdm/cdm_host_proxy_impl.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_IMPL_H_
-#define MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_IMPL_H_
+#ifndef MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_IMPL_H_
+#define MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_IMPL_H_
+
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "media/cdm/api/content_decryption_module.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
 
 namespace media {
 
@@ -149,4 +149,4 @@ cdm::CdmProxy* CdmHostProxyImpl<cdm::Host_10>::RequestCdmProxy(
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_LIBRARY_CDM_CLEAR_KEY_CDM_CDM_HOST_PROXY_IMPL_H_
+#endif  // MEDIA_CDM_LIBRARY_CDM_CDM_HOST_PROXY_IMPL_H_

media/cdm/library_cdm/clear_key_cdm/BUILD.gn

@@ -14,8 +14,6 @@ loadable_module("clear_key_cdm") {
     "cdm_file_adapter.h",
     "cdm_file_io_test.cc",
     "cdm_file_io_test.h",
-    "cdm_host_proxy.h",
-    "cdm_host_proxy_impl.h",
     "cdm_proxy_test.cc",
     "cdm_proxy_test.h",
     "cdm_video_decoder.cc",
@@ -38,6 +36,7 @@ loadable_module("clear_key_cdm") {
     "//media",  # For media::AudioTimestampHelper
     "//media:shared_memory_support",  # For media::AudioBus.
     "//media/cdm:cdm_api",  # For content_decryption_module.h
+    "//media/cdm/library_cdm:cdm_host_proxy",
     "//url",
   ]
 

media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc

@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 
 namespace media {
 

media/cdm/library_cdm/clear_key_cdm/cdm_proxy_test.cc

@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 #include "media/cdm/library_cdm/clear_key_cdm/cdm_proxy_common.h"
 
 namespace media {

media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc

@@ -23,9 +23,9 @@
 #include "media/base/decrypt_config.h"
 #include "media/cdm/api/content_decryption_module_ext.h"
 #include "media/cdm/json_web_key.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy_impl.h"
 #include "media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy_impl.h"
 #include "media/cdm/library_cdm/clear_key_cdm/cdm_proxy_test.h"
 #include "media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.h"
 #include "media/media_buildflags.h"

media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.h

@@ -17,6 +17,7 @@
 #include "base/synchronization/lock.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/cdm_promise.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h"
 
 namespace media {

media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.h

@@ -17,8 +17,8 @@
 #include "base/memory/weak_ptr.h"
 #include "media/base/content_decryption_module.h"
 #include "media/cdm/aes_decryptor.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 #include "media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
 
 namespace media {
 

media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc

@@ -16,7 +16,7 @@
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/data_buffer.h"
 #include "media/base/limits.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/ffmpeg/ffmpeg_decoding_loop.h"
 

media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_video_decoder.cc

@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/base/limits.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/ffmpeg/ffmpeg_decoding_loop.h"
 

media/cdm/library_cdm/clear_key_cdm/libvpx_cdm_video_decoder.cc

@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "media/base/limits.h"
-#include "media/cdm/library_cdm/clear_key_cdm/cdm_host_proxy.h"
+#include "media/cdm/library_cdm/cdm_host_proxy.h"
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"