Fix OnChannelError() in StreamTextureHost

content/renderer/media/android/stream_texture_factory.cc

 // Copyright 2014 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/media/android/stream_texture_factory.h"
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "cc/output/context_provider.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace content {
 
-StreamTextureProxy::StreamTextureProxy(StreamTextureHost* host) : host_(host) {}
+StreamTextureProxy::StreamTextureProxy(std::unique_ptr<StreamTextureHost> host)
+    : host_(std::move(host)) {}
 
 StreamTextureProxy::~StreamTextureProxy() {}
 
 void StreamTextureProxy::Release() {
   {
     // Cannot call |received_frame_cb_| after returning from here.
     base::AutoLock lock(lock_);
     received_frame_cb_.Reset();
   }
   // Release is analogous to the destructor, so there should be no more external
@@ skipping 58 matching lines @@
 
 StreamTextureFactory::StreamTextureFactory(
     scoped_refptr<ContextProviderCommandBuffer> context_provider)
     : context_provider_(std::move(context_provider)),
       channel_(context_provider_->GetCommandBufferProxy()->channel()) {
   DCHECK(channel_);
 }
 
 StreamTextureFactory::~StreamTextureFactory() {}
 
-StreamTextureProxy* StreamTextureFactory::CreateProxy(
+ScopedStreamTextureProxy StreamTextureFactory::CreateProxy(
     unsigned texture_target,
     unsigned* texture_id,
     gpu::Mailbox* texture_mailbox) {
   int32_t route_id =
       CreateStreamTexture(texture_target, texture_id, texture_mailbox);
   if (!route_id)
-    return nullptr;
-  StreamTextureHost* host = new StreamTextureHost(channel_, route_id);
-  return new StreamTextureProxy(host);
+    return ScopedStreamTextureProxy();
+  return ScopedStreamTextureProxy(new StreamTextureProxy(
+      base::MakeUnique<StreamTextureHost>(channel_, route_id)));
 }
 
 unsigned StreamTextureFactory::CreateStreamTexture(
     unsigned texture_target,
     unsigned* texture_id,
     gpu::Mailbox* texture_mailbox) {
   GLuint route_id = 0;
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   gl->GenTextures(1, texture_id);
   gl->ShallowFlushCHROMIUM();
@@ skipping 11 matching lines @@
                                      texture_mailbox->name);
   }
   return route_id;
 }
 
 gpu::gles2::GLES2Interface* StreamTextureFactory::ContextGL() {
   return context_provider_->ContextGL();
 }
 
 }  // namespace content