Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*"

content/browser/renderer_host/compositing_iosurface_mac.mm

 // 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/browser/renderer_host/compositing_iosurface_mac.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/OpenGL.h>
 
 #include "base/bind.h"
@@ skipping 106 matching lines @@
   COMPILE_ASSERT(media::VideoFrame::kYPlane == 0, VideoFrame_kYPlane_mismatch);
   COMPILE_ASSERT(media::VideoFrame::kUPlane == 1, VideoFrame_kUPlane_mismatch);
   COMPILE_ASSERT(media::VideoFrame::kVPlane == 2, VideoFrame_kVPlane_mismatch);
 
   TRACE_EVENT1("browser", "MapBufferToVideoFrame", "plane", plane);
 
   // Apply black-out in the regions surrounding the view area (for
   // letterboxing/pillarboxing).  Only do this once, since this is performed on
   // all planes in the VideoFrame here.
   if (plane == 0)
-    media::LetterboxYUV(target, region_in_frame);
+    media::LetterboxYUV(target.get(), region_in_frame);
 
   if (buf) {
     int packed_width = region_in_frame.width();
     int packed_height = region_in_frame.height();
     // For planes 1 and 2, the width and height are 1/2 size (rounded up).
     if (plane > 0) {
       packed_width = (packed_width + 1) / 2;
       packed_height = (packed_height + 1) / 2;
     }
     const uint8* src = reinterpret_cast<const uint8*>(buf);
@@ skipping 103 matching lines @@
   }
 }
 
 
 // static
 CompositingIOSurfaceMac* CompositingIOSurfaceMac::Create(int window_number) {
   TRACE_EVENT0("browser", "CompositingIOSurfaceMac::Create");
 
   scoped_refptr<CompositingIOSurfaceContext> context =
       CompositingIOSurfaceContext::Get(window_number);
-  if (!context) {
+  if (!context.get()) {
     LOG(ERROR) << "Failed to create context for IOSurface";
     return NULL;
   }
 
   return Create(context);
 }
 
 CompositingIOSurfaceMac* CompositingIOSurfaceMac::Create(
     const scoped_refptr<CompositingIOSurfaceContext>& context) {
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
@@ skipping 78 matching lines @@
   if (!copy_requests_.empty())
     return;
   if (!copy_context_pool_.empty()) {
     CGLSetCurrentContext(context_->cgl_context());
     DestroyAllCopyContextsWithinContext();
     CGLSetCurrentContext(0);
   }
 
   scoped_refptr<CompositingIOSurfaceContext> new_context =
       CompositingIOSurfaceContext::Get(window_number);
-  if (!new_context)
+  if (!new_context.get())
     return;
 
   // Having two NSOpenGLContexts bound to an NSView concurrently will cause
   // artifacts and crashes. If |context_| is bound to |view|, then unbind
   // |context_| before |new_context| gets bound to |view|.
   // http://crbug.com/230883
   if ([context_->nsgl_context() view] == view)
     [context_->nsgl_context() clearDrawable];
 
   context_ = new_context;
@@ skipping 453 matching lines @@
           (base::mac::IsOSMountainLionOrLater() || !IsVendorIntel()));
 }
 
 base::Closure CompositingIOSurfaceMac::CopyToSelectedOutputWithinContext(
     const gfx::Rect& src_pixel_subrect,
     const gfx::Rect& dst_pixel_rect,
     bool called_within_draw,
     const SkBitmap* bitmap_output,
     const scoped_refptr<media::VideoFrame>& video_frame_output,
     const base::Callback<void(bool)>& done_callback) {
-  DCHECK_NE(bitmap_output != NULL, video_frame_output != NULL);
+  DCHECK_NE(bitmap_output != NULL, video_frame_output.get() != NULL);
   DCHECK(!done_callback.is_null());
 
   const bool async_copy = IsAsynchronousReadbackSupported();
   TRACE_EVENT2(
       "browser", "CompositingIOSurfaceMac::CopyToSelectedOutputWithinContext",
       "output", bitmap_output ? "SkBitmap (ARGB)" : "VideoFrame (YV12)",
       "async_readback", async_copy);
 
   CopyContext* copy_context;
   if (copy_context_pool_.empty()) {
@@ skipping 221 matching lines @@
         temp_readback_buffer.reset(
             new uint32[copy_context->output_texture_sizes[i].GetArea()]);
         buf = temp_readback_buffer.get();
       }
     }
     glReadPixels(0, 0,
                  copy_context->output_texture_sizes[i].width(),
                  copy_context->output_texture_sizes[i].height(),
                  GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
                  buf); CHECK_AND_SAVE_GL_ERROR();
-    if (video_frame_output) {
+    if (video_frame_output.get()) {
       if (!temp_readback_buffer) {
         // Apply letterbox black-out around view region.
-        media::LetterboxYUV(video_frame_output, dst_pixel_rect);
+        media::LetterboxYUV(video_frame_output.get(), dst_pixel_rect);
       } else {
         // Copy from temporary buffer and fully render the VideoFrame.
         success &= MapBufferToVideoFrame(video_frame_output, dst_pixel_rect,
                                          temp_readback_buffer.get(), i);
       }
     }
   }
 
   glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0); CHECK_AND_SAVE_GL_ERROR();
   copy_context_pool_.push_back(copy_context);
@@ skipping 33 matching lines @@
 }
 
 GLenum CompositingIOSurfaceMac::GetAndSaveGLError() {
   GLenum gl_error = glGetError();
   if (gl_error_ == GL_NO_ERROR)
     gl_error_ = gl_error;
   return gl_error;
 }
 
 }  // namespace content