Revert of media: Add OutputProtectionProxy

media/cdm/ppapi/external_clear_key/clear_key_cdm.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_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 122 matching lines @@
   // Returns the number of samples generated in the |audio_frames|.
   int GenerateFakeAudioFramesFromDuration(int64_t duration_in_microseconds,
                                           cdm::AudioFrames* audio_frames) const;
 
   // Generates fake video frames given |input_timestamp|.
   // Returns cdm::kSuccess if any audio frame is successfully generated.
   cdm::Status GenerateFakeAudioFrames(int64_t timestamp_in_microseconds,
                                       cdm::AudioFrames* audio_frames);
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
-  void OnUnitTestComplete(bool success);
-
   void StartFileIOTest();
 
   // Callback for CDM File IO test.
   void OnFileIOTestComplete(bool success);
 
-  void StartOutputProtectionTest();
-
   // Keep track of the last session created.
   void SetSessionId(const std::string& session_id);
 
   scoped_refptr<AesDecryptor> decryptor_;
 
   ClearKeyCdmHost* host_;
 
   const std::string key_system_;
 
   std::string last_session_id_;
@@ skipping 44 matching lines @@
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   std::unique_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
   std::unique_ptr<CdmVideoDecoder> video_decoder_;
 
   std::unique_ptr<FileIOTestRunner> file_io_test_runner_;
 
-  bool is_running_output_protection_test_;
-
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_