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

content/renderer/pepper/pepper_video_encoder_host.cc

 // 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.
 
 #include "content/renderer/pepper/pepper_video_encoder_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
@@ skipping 214 matching lines @@
         OnHostMsgRecycleBitstreamBuffer)
     PPAPI_DISPATCH_HOST_RESOURCE_CALL(
         PpapiHostMsg_VideoEncoder_RequestEncodingParametersChange,
         OnHostMsgRequestEncodingParametersChange)
     PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_VideoEncoder_Close,
                                         OnHostMsgClose)
   PPAPI_END_MESSAGE_MAP()
   return PP_ERROR_FAILED;
 }
 
-void PepperVideoEncoderHost::OnGpuControlLostContext() {
-#if DCHECK_IS_ON()
-  // This should never occur more than once.
-  DCHECK(!lost_context_);
-  lost_context_ = true;
-#endif
-  NotifyPepperError(PP_ERROR_RESOURCE_FAILED);
-}
-
 int32_t PepperVideoEncoderHost::OnHostMsgGetSupportedProfiles(
     ppapi::host::HostMessageContext* context) {
   std::vector<PP_VideoProfileDescription> pp_profiles;
   GetSupportedProfiles(&pp_profiles);
 
   host()->SendReply(
       context->MakeReplyMessageContext(),
       PpapiPluginMsg_VideoEncoder_GetSupportedProfilesReply(pp_profiles));
 
   return PP_OK_COMPLETIONPENDING;
@@ skipping 267 matching lines @@
   command_buffer_ = channel_->CreateCommandBuffer(
       gpu::kNullSurfaceHandle, gfx::Size(), nullptr,
       gpu::GpuChannelHost::kDefaultStreamId,
       gpu::GpuChannelHost::kDefaultStreamPriority, attribs, GURL::EmptyGURL(),
       gfx::PreferIntegratedGpu);
   if (!command_buffer_) {
     Close();
     return false;
   }
 
-  command_buffer_->SetGpuControlClient(this);
-
+  command_buffer_->SetContextLostCallback(media::BindToCurrentLoop(
+      base::Bind(&PepperVideoEncoderHost::NotifyPepperError,
+                 weak_ptr_factory_.GetWeakPtr(), PP_ERROR_RESOURCE_FAILED)));
   if (!command_buffer_->Initialize()) {
     Close();
     return false;
   }
 
   return true;
 }
 
 bool PepperVideoEncoderHost::InitializeHardware(
     media::VideoPixelFormat input_format,
@@ skipping 131 matching lines @@
 }
 
 uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32_t buffer_id) {
   DCHECK(RenderThreadImpl::current());
   DCHECK_GE(buffer_id, 0);
   DCHECK_LT(buffer_id, static_cast<int32_t>(shm_buffers_.size()));
   return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory());
 }
 
 }  // namespace content