Move CDM header out of cdm/ppapi directory

As content_decryption_module.h will be used by more than just ppapi, move the DEPS directory up one level. TEST=compiles Review URL: https://codereview.chromium.org/1419933002 Cr-Commit-Position: refs/heads/master@{#355429}
Denger-Network · Oct 21, 2015 · f715b16 · f715b16
1 parent 089a54f
commit f715b16
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -178,7 +178,7 @@ v8.log
 /ios/third_party/gcdwebserver/src
 /llvm
 /media/cast/logging/cast_logging_proto_lib.xml
-/media/cdm/ppapi/api
+/media/cdm/api
 /media/media_asm.xml
 /media/media_mojo_bindings.xml
 /media/test/data/internal

diff --git a/DEPS b/DEPS
@@ -254,7 +254,7 @@ deps = {
   'src/third_party/opus/src':
    Var('chromium_git') + '/chromium/deps/opus.git' + '@' + 'cae696156f1e60006e39821e79a1811ae1933c69',
 
-  'src/media/cdm/ppapi/api':
+  'src/media/cdm/api':
    Var('chromium_git') + '/chromium/cdm.git' + '@' + 'a4773c3cec827c3a880e8a2c22e43a287ced0d20',
 
   'src/third_party/mesa/src':

diff --git a/media/cdm/ppapi/cdm_adapter.gni b/media/cdm/ppapi/cdm_adapter.gni
@@ -18,7 +18,7 @@ template("cdm_adapter") {
     forward_variables_from(invoker, "*")
 
     sources += [
-      "//media/cdm/ppapi/api/content_decryption_module.h",
+      "//media/cdm/api/content_decryption_module.h",
       "//media/cdm/ppapi/cdm_adapter.cc",
       "//media/cdm/ppapi/cdm_adapter.h",
       "//media/cdm/ppapi/cdm_file_io_impl.cc",

diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_wrapper.h"
 #include "media/cdm/ppapi/linked_ptr.h"

diff --git a/media/cdm/ppapi/cdm_file_io_impl.h b/media/cdm/ppapi/cdm_file_io_impl.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/cpp/file_io.h"
 #include "ppapi/cpp/file_ref.h"

diff --git a/media/cdm/ppapi/cdm_file_io_test.h b/media/cdm/ppapi/cdm_file_io_test.h
@@ -12,7 +12,7 @@
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
 

diff --git a/media/cdm/ppapi/cdm_helpers.h b/media/cdm/ppapi/cdm_helpers.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/cpp/dev/buffer_dev.h"

diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/supported_cdm_versions.h"
 #include "ppapi/cpp/logging.h"

diff --git a/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 namespace media {

diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_COMMON_H_
 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_COMMON_H_
 
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
 

diff --git a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 namespace media {

diff --git a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 struct vpx_codec_ctx;

diff --git a/media/cdm/ppapi/supported_cdm_versions.h b/media/cdm/ppapi/supported_cdm_versions.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_CDM_PPAPI_SUPPORTED_CDM_VERSIONS_H_
 #define MEDIA_CDM_PPAPI_SUPPORTED_CDM_VERSIONS_H_
 
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
 

diff --git a/media/cdm/stub/stub_cdm.h b/media/cdm/stub/stub_cdm.h
@@ -6,7 +6,7 @@
 #define MEDIA_CDM_STUB_STUB_CDM_H_
 
 #include "base/basictypes.h"
-#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/api/content_decryption_module.h"
 
 namespace media {
 

diff --git a/media/media_cdm_adapter.gyp b/media/media_cdm_adapter.gyp
@@ -22,7 +22,7 @@
           'type': 'none',
           'direct_dependent_settings': {
             'sources': [
-              'cdm/ppapi/api/content_decryption_module.h',
+              'cdm/api/content_decryption_module.h',
               'cdm/ppapi/cdm_adapter.cc',
               'cdm/ppapi/cdm_adapter.h',
               'cdm/ppapi/cdm_file_io_impl.cc',