Revert of Make lost context and error message callbacks on GpuControl go to client

content/renderer/pepper/pepper_video_encoder_host.h

 // Copyright 2015 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 CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "content/common/content_export.h"
-#include "gpu/command_buffer/client/gpu_control_client.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/ppb_video_frame.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
 namespace gpu {
 class CommandBufferProxyImpl;
 class GpuChannelHost;
 }
 
 namespace media {
 class GpuVideoAcceleratorFactories;
 }
 
 namespace content {
 
 class RendererPpapiHost;
 class VideoEncoderShim;
 
 class CONTENT_EXPORT PepperVideoEncoderHost
     : public ppapi::host::ResourceHost,
       public media::VideoEncodeAccelerator::Client,
-      public ppapi::MediaStreamBufferManager::Delegate,
-      public gpu::GpuControlClient {
+      public ppapi::MediaStreamBufferManager::Delegate {
  public:
   PepperVideoEncoderHost(RendererPpapiHost* host,
                          PP_Instance instance,
                          PP_Resource resource);
   ~PepperVideoEncoderHost() override;
 
  private:
   friend class VideoEncoderShim;
 
   // Shared memory buffers.
@@ skipping 17 matching lines @@
   void BitstreamBufferReady(int32_t bitstream_buffer_id,
                             size_t payload_size,
                             bool key_frame) override;
   void NotifyError(media::VideoEncodeAccelerator::Error error) override;
 
   // ResourceHost implementation.
   int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
       ppapi::host::HostMessageContext* context) override;
 
-  // GpuControlClient implementation.
-  void OnGpuControlLostContext() final;
-  void OnGpuControlErrorMessage(const char* msg, int id) final {}
-
   int32_t OnHostMsgGetSupportedProfiles(
       ppapi::host::HostMessageContext* context);
   int32_t OnHostMsgInitialize(ppapi::host::HostMessageContext* context,
                               PP_VideoFrame_Format input_format,
                               const PP_Size& input_visible_size,
                               PP_VideoProfile output_profile,
                               uint32_t initial_bitrate,
                               PP_HardwareAcceleration acceleration);
   int32_t OnHostMsgGetVideoFrames(ppapi::host::HostMessageContext* context);
   int32_t OnHostMsgEncode(ppapi::host::HostMessageContext* context,
@@ skipping 65 matching lines @@
   // Size of the frames allocated for the encoder (matching hardware
   // constraints).
   gfx::Size input_coded_size_;
 
   // Number of frames the encoder needs.
   uint32_t frame_count_;
 
   // Format of the frames to give to the encoder.
   media::VideoPixelFormat media_input_format_;
 
-#if DCHECK_IS_ON()
-  bool lost_context_ = false;
-#endif
-
   base::WeakPtrFactory<PepperVideoEncoderHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperVideoEncoderHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_