Fix leak in ScopedClipboardWriterGlue.

content/renderer/renderer_clipboard_client.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.
 
 // This file provides the embedder's side of random webkit glue functions.
 
 #include "content/renderer/renderer_clipboard_client.h"
 
 #include "build/build_config.h"
 
@@ skipping 12 matching lines @@
 namespace {
 
 class RendererClipboardWriteContext :
     public webkit_glue::ClipboardClient::WriteContext {
  public:
   RendererClipboardWriteContext();
   virtual ~RendererClipboardWriteContext();
   virtual void WriteBitmapFromPixels(ui::Clipboard::ObjectMap* objects,
                                      const void* pixels,
                                      const gfx::Size& size);
-  virtual void FlushAndDestroy(const ui::Clipboard::ObjectMap& objects);
+  virtual void Flush(const ui::Clipboard::ObjectMap& objects);
 
  private:
   scoped_ptr<base::SharedMemory> shared_buf_;
   DISALLOW_COPY_AND_ASSIGN(RendererClipboardWriteContext);
 };
 
 RendererClipboardWriteContext::RendererClipboardWriteContext() {
 }
 
 RendererClipboardWriteContext::~RendererClipboardWriteContext() {
@@ skipping 29 matching lines @@
   ui::Clipboard::ObjectMapParams params;
 
   // The first parameter is replaced on the receiving end with a pointer to
   // a shared memory object containing the bitmap. We reserve space for it here.
   ui::Clipboard::ObjectMapParam place_holder_param;
   params.push_back(place_holder_param);
   params.push_back(size_param);
   (*objects)[ui::Clipboard::CBF_SMBITMAP] = params;
 }
 
-// Define a destructor that makes IPCs to flush the contents to the
-// system clipboard.
-void RendererClipboardWriteContext::FlushAndDestroy(
+// Flushes the objects to the clipboard with an IPC.
+void RendererClipboardWriteContext::Flush(
     const ui::Clipboard::ObjectMap& objects) {
-  scoped_ptr<RendererClipboardWriteContext> delete_on_return(this);
-
   if (shared_buf_.get()) {
     RenderThreadImpl::current()->Send(
         new ClipboardHostMsg_WriteObjectsSync(objects, shared_buf_->handle()));
   } else {
     RenderThreadImpl::current()->Send(
         new ClipboardHostMsg_WriteObjectsAsync(objects));
   }
 }
 
 }  // anonymous namespace
@@ skipping 82 matching lines @@
                                              const string16& type,
                                              string16* data) {
   RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadCustomData(buffer, type, data));
 }
 
 webkit_glue::ClipboardClient::WriteContext*
 RendererClipboardClient::CreateWriteContext() {
   return new RendererClipboardWriteContext;
 }