media: Move cdm_file_adapter.*

Move to media/cdm/ppapi/external_clear_key/ because they are only used
by ClearKeyCdm.

BUG=796345

Change-Id: I40f210f0d20588642c7235473ab6fb4179e2332f
Reviewed-on: https://chromium-review.googlesource.com/835049Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525263}

media/cdm/BUILD.gn

@@ -70,8 +70,6 @@ source_set("cdm") {
       "cdm_allocator.h",
       "cdm_auxiliary_helper.cc",
       "cdm_auxiliary_helper.h",
-      "cdm_file_adapter.cc",
-      "cdm_file_adapter.h",
       "cdm_helpers.cc",
       "cdm_helpers.h",
       "cdm_module.cc",

media/cdm/ppapi/BUILD.gn

@@ -13,6 +13,8 @@ shared_library("clearkeycdm") {
   sources = [
     "cdm_file_io_test.cc",
     "cdm_file_io_test.h",
+    "external_clear_key/cdm_file_adapter.cc",
+    "external_clear_key/cdm_file_adapter.h",
     "external_clear_key/cdm_video_decoder.cc",
     "external_clear_key/cdm_video_decoder.h",
     "external_clear_key/clear_key_cdm.cc",

media/cdm/cdm_file_adapter.cc → media/cdm/ppapi/external_clear_key/cdm_file_adapter.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/cdm_file_adapter.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_file_adapter.h"
 
 #include <memory>
 

media/cdm/cdm_file_adapter.h → media/cdm/ppapi/external_clear_key/cdm_file_adapter.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_CDM_FILE_ADAPTER_H_
-#define MEDIA_CDM_CDM_FILE_ADAPTER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_FILE_ADAPTER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_FILE_ADAPTER_H_
 
 #include <stdint.h>
 
@@ -13,13 +13,12 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "media/base/media_export.h"
 #include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
 
 // This class provides the ability to read and write a file using cdm::FileIO.
-class MEDIA_EXPORT CdmFileAdapter : public cdm::FileIOClient {
+class CdmFileAdapter : public cdm::FileIOClient {
  public:
   enum class Status { kSuccess, kInUse, kError };
   using FileOpenedCB = base::OnceCallback<void(Status status)>;
@@ -64,4 +63,4 @@ class MEDIA_EXPORT CdmFileAdapter : public cdm::FileIOClient {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_CDM_FILE_ADAPTER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_FILE_ADAPTER_H_

media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.h

@@ -17,7 +17,7 @@
 #include "base/memory/weak_ptr.h"
 #include "media/base/content_decryption_module.h"
 #include "media/cdm/aes_decryptor.h"
-#include "media/cdm/cdm_file_adapter.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_file_adapter.h"
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 namespace media {