Add Reset to ScopedClosureRunner.

content/browser/renderer_host/render_widget_host_view_aura.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/browser/renderer_host/render_widget_host_view_aura.h"
 
+#include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/texture_mailbox.h"
@@ skipping 1789 matching lines @@
 
   scoped_ptr<SkAutoLockPixels> bitmap_pixels_lock(
       new SkAutoLockPixels(*bitmap));
   uint8* pixels = static_cast<uint8*>(bitmap->getPixels());
 
   scoped_ptr<cc::TextureMailbox> texture_mailbox = result->TakeTexture();
   DCHECK(texture_mailbox->IsTexture());
   if (!texture_mailbox->IsTexture())
     return;
 
-  scoped_callback_runner.Release();
+  ignore_result(scoped_callback_runner.Release());
 
   gl_helper->CropScaleReadbackAndCleanMailbox(
       texture_mailbox->name(),
       texture_mailbox->sync_point(),
       result->size(),
       gfx::Rect(result->size()),
       dst_size_in_pixel,
       pixels,
       base::Bind(&CopyFromCompositingSurfaceFinished,
                  callback,
@@ skipping 12 matching lines @@
   base::ScopedClosureRunner scoped_callback_runner(
       base::Bind(callback, false, SkBitmap()));
   if (!result->HasBitmap())
     return;
 
   scoped_ptr<SkBitmap> source = result->TakeBitmap();
   DCHECK(source);
   if (!source)
     return;
 
-  scoped_callback_runner.Release();
+  ignore_result(scoped_callback_runner.Release());
 
   SkBitmap bitmap = skia::ImageOperations::Resize(
       *source,
       skia::ImageOperations::RESIZE_BEST,
       dst_size_in_pixel.width(),
       dst_size_in_pixel.height());
   callback.Run(true, bitmap);
 }
 
 static void CopyFromCompositingSurfaceFinishedForVideo(
@@ skipping 56 matching lines @@
 
     {
       SkAutoLockPixels scaled_bitmap_locker(scaled_bitmap);
 
       media::CopyRGBToVideoFrame(
           reinterpret_cast<uint8*>(scaled_bitmap.getPixels()),
           scaled_bitmap.rowBytes(),
           region_in_frame,
           video_frame.get());
     }
-    scoped_callback_runner.Release();
+    ignore_result(scoped_callback_runner.Release());
     callback.Run(true);
     return;
   }
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   GLHelper* gl_helper = factory->GetGLHelper();
   if (!gl_helper)
     return;
 
   scoped_ptr<cc::TextureMailbox> texture_mailbox = result->TakeTexture();
@@ skipping 29 matching lines @@
         gl_helper->CreateReadbackPipelineYUV(quality,
                                              result_rect.size(),
                                              result_rect,
                                              video_frame->coded_size(),
                                              region_in_frame,
                                              true,
                                              false));
     yuv_readback_pipeline = rwhva->yuv_readback_pipeline_.get();
   }
 
-  scoped_callback_runner.Release();
+  ignore_result(scoped_callback_runner.Release());
   base::Callback<void(bool result)> finished_callback = base::Bind(
       &CopyFromCompositingSurfaceFinishedForVideo,
       callback,
       texture_mailbox->callback());
   yuv_readback_pipeline->ReadbackYUV(
       texture_mailbox->name(),
       texture_mailbox->sync_point(),
       video_frame.get(),
       finished_callback);
 }
@@ skipping 1269 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content