Revert of media: Add OutputProtectionProxy

media/cdm/ppapi/ppapi_cdm_adapter.h

 // Copyright 2013 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.
 
 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
 #define MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
 #include "base/macros.h"
 #include "media/cdm/api/content_decryption_module.h"
 #include "media/cdm/cdm_helpers.h"
 #include "media/cdm/cdm_wrapper.h"
 #include "media/cdm/ppapi/linked_ptr.h"
 #include "media/cdm/ppapi/ppapi_cdm_buffer.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/private/content_decryptor_private.h"
-#include "ppapi/cpp/private/output_protection_private.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 #if defined(OS_CHROMEOS)
+#include "ppapi/cpp/private/output_protection_private.h"
 #include "ppapi/cpp/private/platform_verification.h"
 #endif
 
 namespace media {
 
 // GetCdmHostFunc implementation.
 void* GetCdmHost(int host_interface_version, void* user_data);
 
 // An adapter class for abstracting away PPAPI interaction and threading for a
 // Content Decryption Module (CDM).
@@ skipping 192 matching lines @@
   // Callback to report |file_size_bytes| of the first file read by FileIO.
   void OnFirstFileRead(int32_t file_size_bytes);
 
 #if !defined(NDEBUG)
   // Logs the given message to the JavaScript console associated with the
   // CDM adapter instance. The name of the CDM adapter issuing the log message
   // will be automatically prepended to the message.
   void LogToConsole(const pp::Var& value);
 #endif  // !defined(NDEBUG)
 
+#if defined(OS_CHROMEOS)
   void ReportOutputProtectionUMA(OutputProtectionStatus status);
   void ReportOutputProtectionQuery();
   void ReportOutputProtectionQueryResult();
 
-  void EnableProtectionDone(int32_t result);
-  void QueryOutputProtectionStatusDone(int32_t result);
-
-#if defined(OS_CHROMEOS)
   struct PepperPlatformChallengeResponse {
     pp::Var signed_data;
     pp::Var signed_data_signature;
     pp::Var platform_key_certificate;
   };
 
   void SendPlatformChallengeDone(
       int32_t result,
       const linked_ptr<PepperPlatformChallengeResponse>& response);
-#endif
+  void EnableProtectionDone(int32_t result);
+  void QueryOutputProtectionStatusDone(int32_t result);
 
   pp::OutputProtection_Private output_protection_;
+  pp::PlatformVerification platform_verification_;
 
   // Same as above, these are only read by QueryOutputProtectionStatusDone().
   uint32_t output_link_mask_;
   uint32_t output_protection_mask_;
   bool query_output_protection_in_progress_;
 
   // Tracks whether an output protection query and a positive query result (no
   // unprotected external link) have been reported to UMA.
   bool uma_for_output_protection_query_reported_;
   bool uma_for_output_protection_positive_result_reported_;
-
-#if defined(OS_CHROMEOS)
-  pp::PlatformVerification platform_verification_;
 #endif
 
   PpbBufferAllocator allocator_;
   pp::CompletionCallbackFactory<PpapiCdmAdapter> callback_factory_;
   linked_ptr<CdmWrapper> cdm_;
   std::string key_system_;
   bool allow_distinctive_identifier_;
   bool allow_persistent_state_;
 
   // If the CDM returned kDeferredInitialization during InitializeAudioDecoder()
   // or InitializeVideoDecoder(), the (Audio|Video)DecoderConfig.request_id is
   // saved for the future call to OnDeferredInitializationDone().
   bool deferred_initialize_audio_decoder_;
   uint32_t deferred_audio_decoder_config_id_;
   bool deferred_initialize_video_decoder_;
   uint32_t deferred_video_decoder_config_id_;
 
   uint32_t last_read_file_size_kb_;
   bool file_size_uma_reported_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiCdmAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_