Revert of media: Add OutputProtectionProxy

chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h

Index: chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h
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
index 55d40405650f7dc5f206af39024d8e8b26b35f26..fe4865b8bb871664a1aeb5b12191237ac915fc55 100644
--- a/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h
+++ b/chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h
@@ -7,11 +7,8 @@
 
 #include <stdint.h>
 
-#include <memory>
-
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/browser/browser_thread.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/host/resource_message_filter.h"
@@ -26,9 +23,13 @@
 }  // namespace host
 }  // namespace ppapi
 
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class OutputProtectionDelegate;
+}
+#endif
+
 namespace chrome {
-
-class OutputProtectionProxy;
 
 class PepperOutputProtectionMessageFilter
     : public ppapi::host::ResourceMessageFilter {
@@ -59,9 +60,10 @@
       ppapi::host::ReplyMessageContext reply_context,
       bool success);
 
-  std::unique_ptr<OutputProtectionProxy,
-                  content::BrowserThread::DeleteOnUIThread>
-      proxy_;
+#if defined(OS_CHROMEOS)
+  // Delegate. Should be deleted in UI thread.
+  chromeos::OutputProtectionDelegate* delegate_;
+#endif
 
   base::WeakPtrFactory<PepperOutputProtectionMessageFilter> weak_ptr_factory_;