Add Reset to ScopedClosureRunner.

content/browser/gpu/gpu_process_host.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/gpu/gpu_process_host.h"
 
 #include "base/base64.h"
 #include "base/base_switches.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/memory/ref_counted.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_child_process_host_impl.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
@@ skipping 872 matching lines @@
   }
   RenderWidgetHelper* helper =
       RenderWidgetHelper::FromProcessHostID(render_process_id);
   if (!helper)
     return;
 
   // Pass the SwapBuffers on to the RenderWidgetHelper to wake up the UI thread
   // if the browser is waiting for a new frame. Otherwise the RenderWidgetHelper
   // will forward to the RenderWidgetHostView via RenderProcessHostImpl and
   // RenderWidgetHostImpl.
-  scoped_completion_runner.Release();
+  ignore_result(scoped_completion_runner.Release());
 
   ViewHostMsg_CompositorSurfaceBuffersSwapped_Params view_params;
   view_params.surface_id = params.surface_id;
   view_params.surface_handle = params.surface_handle;
   view_params.route_id = params.route_id;
   view_params.size = params.size;
   view_params.scale_factor = params.scale_factor;
   view_params.gpu_process_host_id = host_id_;
   view_params.latency_info = params.latency_info;
   helper->DidReceiveBackingStoreMsg(ViewHostMsg_CompositorSurfaceBuffersSwapped(
@@ skipping 15 matching lines @@
   gfx::GLSurfaceHandle handle =
       GpuSurfaceTracker::Get()->GetSurfaceHandle(params.surface_id);
 
   if (handle.is_null())
     return;
 
   if (handle.transport_type == gfx::TEXTURE_TRANSPORT) {
     TRACE_EVENT1("gpu", "SurfaceIDNotFound_RoutingToUI",
                  "surface_id", params.surface_id);
     // This is a content area swap, send it on to the UI thread.
-    scoped_completion_runner.Release();
+    ignore_result(scoped_completion_runner.Release());
     RouteOnUIThread(GpuHostMsg_AcceleratedSurfaceBuffersSwapped(params));
     return;
   }
 
   // Otherwise it's the UI swap.
 
   scoped_refptr<AcceleratedPresenter> presenter(
       AcceleratedPresenter::GetForWindow(handle.handle));
   if (!presenter) {
     TRACE_EVENT1("gpu",
                  "EarlyOut_NativeWindowNotFound",
                  "handle",
                  handle.handle);
-    scoped_completion_runner.Release();
+    ignore_result(scoped_completion_runner.Release());
     AcceleratedSurfaceBuffersSwappedCompleted(host_id_,
                                               params.route_id,
                                               params.surface_id,
                                               true,
                                               base::TimeTicks(),
                                               base::TimeDelta(),
                                               params.latency_info);
     return;
   }
 
-  scoped_completion_runner.Release();
+  ignore_result(scoped_completion_runner.Release());
   presenter->AsyncPresentAndAcknowledge(
       params.size,
       params.surface_handle,
       params.latency_info,
       base::Bind(&AcceleratedSurfaceBuffersSwappedCompleted,
                  host_id_,
                  params.route_id,
                  params.surface_id));
 
   FrameSubscriberMap::iterator it = frame_subscribers_.find(params.surface_id);
@@ skipping 268 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
 }
 
 }  // namespace content