Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*"

content/renderer/media/renderer_gpu_video_decoder_factories.cc

 // Copyright (c) 2012 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/renderer_gpu_video_decoder_factories.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include "base/bind.h"
@@ skipping 31 matching lines @@
       // thread, and only as the result of a PostTask from the render thread
       // which can only happen after this function returns, so our PostTask will
       // run first.
       context));
   compositor_loop_async_waiter_.Wait();
 }
 
 void RendererGpuVideoDecoderFactories::AsyncGetContext(
     WebGraphicsContext3DCommandBufferImpl* context) {
   context_ = context->AsWeakPtr();
-  if (context_) {
+  if (context_.get()) {
     if (context_->makeContextCurrent()) {
       // Called once per media player, but is a no-op after the first one in
       // each renderer.
       context_->insertEventMarkerEXT("GpuVDAContext3D");
     }
   }
   compositor_loop_async_waiter_.Signal();
 }
 
 media::VideoDecodeAccelerator*
@@ skipping 19 matching lines @@
     return NULL;
   }
   return vda_.release();
 }
 
 void RendererGpuVideoDecoderFactories::AsyncCreateVideoDecodeAccelerator(
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client) {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
-  if (context_ && context_->GetCommandBufferProxy()) {
+  if (context_.get() && context_->GetCommandBufferProxy()) {
     vda_ = gpu_channel_host_->CreateVideoDecoder(
-        context_->GetCommandBufferProxy()->GetRouteID(),
-        profile, client);
+        context_->GetCommandBufferProxy()->GetRouteID(), profile, client);
   }
   compositor_loop_async_waiter_.Signal();
 }
 
 bool RendererGpuVideoDecoderFactories::CreateTextures(
     int32 count, const gfx::Size& size,
     std::vector<uint32>* texture_ids,
     uint32 texture_target) {
   DCHECK(!message_loop_->BelongsToCurrentThread());
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &RendererGpuVideoDecoderFactories::AsyncCreateTextures, this,
       count, size, texture_target));
 
   base::WaitableEvent* objects[] = {&aborted_waiter_,
                                     &compositor_loop_async_waiter_};
   if (base::WaitableEvent::WaitMany(objects, arraysize(objects)) == 0)
     return false;
   texture_ids->swap(created_textures_);
   return true;
 }
 
 void RendererGpuVideoDecoderFactories::AsyncCreateTextures(
     int32 count, const gfx::Size& size, uint32 texture_target) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(texture_target);
 
-  if (!context_) {
+  if (!context_.get()) {
     compositor_loop_async_waiter_.Signal();
     return;
   }
   gpu::gles2::GLES2Implementation* gles2 = context_->GetImplementation();
   created_textures_.resize(count);
   gles2->GenTextures(count, &created_textures_[0]);
   for (int i = 0; i < count; ++i) {
     gles2->ActiveTexture(GL_TEXTURE0);
     uint32 texture_id = created_textures_[i];
     gles2->BindTexture(texture_target, texture_id);
@@ skipping 15 matching lines @@
 }
 
 void RendererGpuVideoDecoderFactories::DeleteTexture(uint32 texture_id) {
   DCHECK(!message_loop_->BelongsToCurrentThread());
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &RendererGpuVideoDecoderFactories::AsyncDeleteTexture, this, texture_id));
 }
 
 void RendererGpuVideoDecoderFactories::AsyncDeleteTexture(uint32 texture_id) {
   DCHECK(message_loop_->BelongsToCurrentThread());
-  if (!context_)
+  if (!context_.get())
     return;
 
   gpu::gles2::GLES2Implementation* gles2 = context_->GetImplementation();
   gles2->DeleteTextures(1, &texture_id);
   DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
 }
 
 void RendererGpuVideoDecoderFactories::ReadPixels(
     uint32 texture_id, uint32 texture_target, const gfx::Size& size,
     const SkBitmap& pixels) {
@@ skipping 13 matching lines @@
       return;
   } else {
     AsyncReadPixels(texture_id, texture_target, size);
   }
   read_pixels_bitmap_.setPixelRef(NULL);
 }
 
 void RendererGpuVideoDecoderFactories::AsyncReadPixels(
     uint32 texture_id, uint32 texture_target, const gfx::Size& size) {
   DCHECK(message_loop_->BelongsToCurrentThread());
-  if (!context_) {
+  if (!context_.get()) {
     compositor_loop_async_waiter_.Signal();
     return;
   }
 
   gpu::gles2::GLES2Implementation* gles2 = context_->GetImplementation();
 
   GLuint tmp_texture;
   gles2->GenTextures(1, &tmp_texture);
   gles2->BindTexture(texture_target, tmp_texture);
   gles2->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ skipping 54 matching lines @@
   return aborted_waiter_.IsSignaled();
 }
 
 void RendererGpuVideoDecoderFactories::AsyncDestroyVideoDecodeAccelerator() {
   // OK to release because Destroy() will delete the VDA instance.
   if (vda_)
     vda_.release()->Destroy();
 }
 
 }  // namespace content