Remove output protection pepper APIs

Now that CDMs use mojo exclusively, remove the Pepper APIs that are now unused. BUG=772160 TEST=compiles Change-Id: I4161d7430f86f5033dd7997fb5f2cc4a04aefa22 Reviewed-on: https://chromium-review.googlesource.com/988254 Reviewed-by: Bill Budge <bbudge@chromium.org> Reviewed-by: Xiaohan Wang <xhwang@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Ben Smith <binji@chromium.org> Commit-Queue: John Rummell <jrummell@chromium.org> Cr-Commit-Position: refs/heads/master@{#549671}
FairyWorld · Apr 10, 2018 · 8682bf2 · 8682bf2
1 parent 0e4e6c2
commit 8682bf2
Show file tree

Hide file tree

Showing 34 changed files with 0 additions and 1,107 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -3863,8 +3863,6 @@ jumbo_split_static_library("browser") {
       "renderer_host/pepper/pepper_flash_drm_host.h",
       "renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
       "renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
-      "renderer_host/pepper/pepper_output_protection_message_filter.cc",
-      "renderer_host/pepper/pepper_output_protection_message_filter.h",
       "renderer_host/pepper/pepper_platform_verification_message_filter.cc",
       "renderer_host/pepper/pepper_platform_verification_message_filter.h",
     ]

diff --git a/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
 #include "chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h"
-#include "chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_platform_verification_message_filter.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/message_filter_host.h"
@@ -57,13 +56,6 @@ ChromeBrowserPepperHostFactory::CreateResourceHost(
         return std::unique_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, resource, pv_filter));
       }
-      case PpapiHostMsg_OutputProtection_Create::ID: {
-        scoped_refptr<ResourceMessageFilter> output_protection_filter(
-            new PepperOutputProtectionMessageFilter(host_, instance));
-        return std::unique_ptr<ResourceHost>(
-            new MessageFilterHost(host_->GetPpapiHost(), instance, resource,
-                                  output_protection_filter));
-      }
     }
   }
 

diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h
diff --git a/chrome/common/ppapi_utils.cc b/chrome/common/ppapi_utils.cc
@@ -90,7 +90,6 @@
 #include "ppapi/c/private/ppb_flash_print.h"
 #include "ppapi/c/private/ppb_host_resolver_private.h"
 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
-#include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_platform_verification_private.h"
 #include "ppapi/c/private/ppb_proxy_private.h"

diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -1259,10 +1259,6 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, FlashDRM) {
           LIST_TEST(FlashDRM_GetVoucherFile));
 }
 
-#if defined(OS_CHROMEOS)
-TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
-#endif
-
 #if BUILDFLAG(ENABLE_NACL)
 class PackagedAppTest : public ExtensionBrowserTest {
  public:

diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
@@ -122,7 +122,6 @@
 #include "ppapi/c/private/ppb_host_resolver_private.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
-#include "ppapi/c/private/ppb_output_protection_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/private/ppb_platform_verification_private.h"
 #include "ppapi/c/private/ppb_proxy_private.h"

diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc
@@ -283,11 +283,6 @@ PP_Resource ResourceCreationImpl::CreateNetworkMonitor(PP_Instance instance) {
   return 0;  // Not supported in-process.
 }
 
-PP_Resource ResourceCreationImpl::CreateOutputProtectionPrivate(
-    PP_Instance instance) {
-  return 0;  // Not supported in-process.
-}
-
 PP_Resource ResourceCreationImpl::CreatePlatformVerificationPrivate(
     PP_Instance instance) {
   return 0;  // Not supported in-process.

diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h
@@ -114,7 +114,6 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI {
       const PP_NetAddress_Private& private_addr) override;
   PP_Resource CreateNetworkMonitor(PP_Instance instance) override;
   PP_Resource CreatePlatformVerificationPrivate(PP_Instance instance) override;
-  PP_Resource CreateOutputProtectionPrivate(PP_Instance instance) override;
   PP_Resource CreateTCPServerSocketPrivate(PP_Instance instance) override;
   PP_Resource CreateTCPSocket1_0(PP_Instance instance) override;
   PP_Resource CreateTCPSocket(PP_Instance instance) override;

diff --git a/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
@@ -13,7 +13,6 @@
           'host_resolver_private.cc',
           'isolated_file_system_private.cc',
           'net_address_private.cc',
-          'output_protection_private.cc',
           'pass_file_handle.cc',
           'tcp_socket_private.cc',
           'tcp_server_socket_private.cc',
@@ -33,7 +32,6 @@
         'ppb_host_resolver_private.h',
         'ppb_isolated_file_system_private.h',
         'ppb_net_address_private.h',
-        'ppb_output_protection_private.h',
         'ppb_tcp_server_socket_private.h',
         'ppb_tcp_socket_private.h',
         'ppb_udp_socket_private.h',
@@ -52,7 +50,6 @@
         'host_resolver_private.h',
         'isolated_file_system_private.h',
         'net_address_private.h',
-        'output_protection_private.h',
         'pass_file_handle.h',
         'tcp_server_socket_private.h',
         'tcp_socket_private.h',

diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
@@ -92,8 +92,6 @@ test_common_source_files = [
   "tests/test_network_monitor.h",
   "tests/test_network_proxy.cc",
   "tests/test_network_proxy.h",
-  "tests/test_output_protection_private.cc",
-  "tests/test_output_protection_private.h",
   "tests/test_paint_aggregator.cc",
   "tests/test_paint_aggregator.h",
   "tests/test_post_message.cc",