Remove implicit conversions from scoped_refptr to T* in content/renderer/pepper/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610
R=raymes@chromium.org

Review URL: https://codereview.chromium.org/505013002

Cr-Commit-Position: refs/heads/master@{#291820}

8 files changed, 20 insertions, 21 deletions

diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
index 6116a36..e372b1b 100644
--- a/content/renderer/pepper/pepper_compositor_host.cc
+++ b/content/renderer/pepper/pepper_compositor_host.cc
@@ -219,19 +219,19 @@ void PepperCompositorHost::UpdateLayer(
       new_layer->common.clip_rect.size.width != 0 ||
       new_layer->common.clip_rect.size.height != 0) {
     scoped_refptr<cc::Layer> clip_parent = layer->parent();
-    if (clip_parent == layer_) {
+    if (clip_parent.get() == layer_.get()) {
       // Create a clip parent layer, if it does not exist.
       clip_parent = cc::Layer::Create();
       clip_parent->SetMasksToBounds(true);
       clip_parent->SetIsDrawable(true);
-      layer_->ReplaceChild(layer, clip_parent);
+      layer_->ReplaceChild(layer.get(), clip_parent);
       clip_parent->AddChild(layer);
     }
     gfx::Point position = PP_ToGfxPoint(new_layer->common.clip_rect.point);
     clip_parent->SetPosition(position);
     clip_parent->SetBounds(PP_ToGfxSize(new_layer->common.clip_rect.size));
     layer->SetPosition(gfx::Point(-position.x(), -position.y()));
-  } else if (layer->parent() != layer_) {
+  } else if (layer->parent() != layer_.get()) {
     // Remove the clip parent layer.
     layer_->ReplaceChild(layer->parent(), layer);
     layer->SetPosition(gfx::Point());
@@ -348,11 +348,11 @@ int32_t PepperCompositorHost::OnHostMsgCommitLayers(
   for (size_t i = 0; i < layers.size(); ++i) {
     const ppapi::CompositorLayerData* pp_layer = &layers[i];
     LayerData* data = i >= layers_.size() ? NULL : &layers_[i];
-    DCHECK(!data || data->cc_layer);
+    DCHECK(!data || data->cc_layer.get());
     scoped_refptr<cc::Layer> cc_layer = data ? data->cc_layer : NULL;
     ppapi::CompositorLayerData* old_layer = data ? &data->pp_layer : NULL;
 
-    if (!cc_layer) {
+    if (!cc_layer.get()) {
       if (pp_layer->color)
         cc_layer = cc::SolidColorLayer::Create();
       else if (pp_layer->texture || pp_layer->image)
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
index 1502bf3..3bc2296 100644
--- a/content/renderer/pepper/pepper_graphics_2d_host.cc
+++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -403,7 +403,7 @@ PPB_ImageData_Impl* PepperGraphics2DHost::ImageData() {
 }
 
 gfx::Size PepperGraphics2DHost::Size() const {
-  if (!image_data_)
+  if (!image_data_.get())
     return gfx::Size();
   return gfx::Size(image_data_->width(), image_data_->height());
 }
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
index 6442d1b..7fdcd8f 100644
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -385,7 +385,7 @@ void PepperMediaStreamVideoTrackHost::OnVideoFrame(
     const scoped_refptr<VideoFrame>& frame,
     const media::VideoCaptureFormat& format,
     const base::TimeTicks& estimated_capture_time) {
-  DCHECK(frame);
+  DCHECK(frame.get());
   // TODO(penghuang): Check |frame->end_of_stream()| and close the track.
   PP_VideoFrame_Format ppformat = ToPpapiFormat(frame->format());
   if (ppformat == PP_VIDEOFRAME_FORMAT_UNKNOWN)
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 682a6da..b9170f4 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -747,7 +747,7 @@ void PepperPluginInstanceImpl::InvalidateRect(const gfx::Rect& rect) {
   }
 
   cc::Layer* layer =
-      texture_layer_ ? texture_layer_.get() : compositor_layer_.get();
+      texture_layer_.get() ? texture_layer_.get() : compositor_layer_.get();
   if (layer) {
     if (rect.IsEmpty()) {
       layer->SetNeedsDisplay();
@@ -761,7 +761,7 @@ void PepperPluginInstanceImpl::ScrollRect(int dx,
                                           int dy,
                                           const gfx::Rect& rect) {
   cc::Layer* layer =
-      texture_layer_ ? texture_layer_.get() : compositor_layer_.get();
+      texture_layer_.get() ? texture_layer_.get() : compositor_layer_.get();
   if (layer) {
     InvalidateRect(rect);
   } else if (fullscreen_container_) {
@@ -1529,7 +1529,7 @@ bool PepperPluginInstanceImpl::LoadPrivateInterface() {
   // If this is *not* a NaCl plugin, original_module_ will never be set; we talk
   // to the "real" module.
   scoped_refptr<PluginModule> module =
-      original_module_ ? original_module_ : module_;
+      original_module_.get() ? original_module_ : module_;
   // Only check for the interface if the plugin has private permission.
   if (!module->permissions().HasPermission(ppapi::PERMISSION_PRIVATE))
     return false;
@@ -1568,7 +1568,7 @@ bool PepperPluginInstanceImpl::LoadZoomInterface() {
 }
 
 void PepperPluginInstanceImpl::UpdateLayerTransform() {
-  if (!bound_graphics_2d_platform_ || !texture_layer_) {
+  if (!bound_graphics_2d_platform_ || !texture_layer_.get()) {
     // Currently the transform is only applied for Graphics2D.
     return;
   }
@@ -2043,16 +2043,15 @@ void PepperPluginInstanceImpl::UpdateLayer(bool device_changed) {
   bool want_texture_layer = want_3d_layer || want_2d_layer;
   bool want_compositor_layer = !!bound_compositor_;
 
-  if (!device_changed &&
-      (want_texture_layer == !!texture_layer_.get()) &&
+  if (!device_changed && (want_texture_layer == !!texture_layer_.get()) &&
       (want_3d_layer == layer_is_hardware_) &&
-      (want_compositor_layer == !!compositor_layer_) &&
+      (want_compositor_layer == !!compositor_layer_.get()) &&
       layer_bound_to_fullscreen_ == !!fullscreen_container_) {
     UpdateLayerTransform();
     return;
   }
 
-  if (texture_layer_ || compositor_layer_) {
+  if (texture_layer_.get() || compositor_layer_.get()) {
     if (!layer_bound_to_fullscreen_)
       container_->setWebLayer(NULL);
     else if (fullscreen_container_)
@@ -2633,7 +2632,7 @@ ppapi::Resource* PepperPluginInstanceImpl::GetSingletonResource(
     case ppapi::GAMEPAD_SINGLETON_ID:
       return gamepad_impl_.get();
     case ppapi::UMA_SINGLETON_ID: {
-      if (!uma_private_impl_) {
+      if (!uma_private_impl_.get()) {
         RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host();
         if (host_impl->in_process_router()) {
           uma_private_impl_ = new ppapi::proxy::UMAPrivateResource(
diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc
index b5de4b0..da7be19 100644
--- a/content/renderer/pepper/pepper_url_request_unittest.cc
+++ b/content/renderer/pepper/pepper_url_request_unittest.cc
@@ -132,7 +132,7 @@ TEST_F(URLRequestInfoTest, GetInterface) {
 }
 
 TEST_F(URLRequestInfoTest, AsURLRequestInfo) {
-  EXPECT_EQ(info_, info_->AsPPB_URLRequestInfo_API());
+  EXPECT_EQ(info_.get(), info_->AsPPB_URLRequestInfo_API());
 }
 
 TEST_F(URLRequestInfoTest, StreamToFile) {
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.h b/content/renderer/pepper/ppb_graphics_3d_impl.h
index f4e54a4..4e63cf2 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.h
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.h
@@ -57,7 +57,7 @@ class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared {
 
   int GetCommandBufferRouteId();
 
-  GpuChannelHost* channel() { return channel_; }
+  GpuChannelHost* channel() { return channel_.get(); }
 
  protected:
   virtual ~PPB_Graphics3D_Impl();
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc
index 6923776..5fdd87f 100644
--- a/content/renderer/pepper/v8_var_converter.cc
+++ b/content/renderer/pepper/v8_var_converter.cc
@@ -157,7 +157,7 @@ bool GetOrCreateV8Value(v8::Handle<v8::Context> context,
     case PP_VARTYPE_OBJECT: {
       DCHECK(object_vars_allowed);
       scoped_refptr<V8ObjectVar> v8_object_var = V8ObjectVar::FromPPVar(var);
-      if (!v8_object_var) {
+      if (!v8_object_var.get()) {
         NOTREACHED();
         result->Clear();
         return false;
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index d213ac9..d175728 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -302,8 +302,8 @@ VideoDecoderShim::VideoDecoderShim(PepperVideoDecoderHost* host)
       num_pending_decodes_(0),
       weak_ptr_factory_(this) {
   DCHECK(host_);
-  DCHECK(media_message_loop_);
-  DCHECK(context_provider_);
+  DCHECK(media_message_loop_.get());
+  DCHECK(context_provider_.get());
   decoder_impl_.reset(new DecoderImpl(weak_ptr_factory_.GetWeakPtr()));
 }