Fix leak with SharedBitmaps allocated by new[]

content/common/host_shared_bitmap_manager.cc

 // Copyright 2013 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/common/host_shared_bitmap_manager.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/size.h"
@@ skipping 45 matching lines @@
       new BitmapData(base::GetCurrentProcessHandle(),
                      base::SharedMemory::NULLHandle(),
                      bitmap_size));
   // Bitmaps allocated in host don't need to be shared to other processes, so
   // allocate them with new instead.
   data->pixels = scoped_ptr<uint8[]>(new uint8[bitmap_size]);
 
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
   handle_map_[id] = data;
   return make_scoped_ptr(new cc::SharedBitmap(
-      data->pixels.get(), id, base::Bind(&FreeSharedMemory, data)));
+      data->pixels.get(),
+      id,
+      base::Bind(&HostSharedBitmapManager::FreeSharedMemoryFromMap,
+                 base::Unretained(this))));
 }
 
 scoped_ptr<cc::SharedBitmap> HostSharedBitmapManager::GetSharedBitmapFromId(
     const gfx::Size& size,
     const cc::SharedBitmapId& id) {
   base::AutoLock lock(lock_);
   BitmapMap::iterator it = handle_map_.find(id);
   if (it == handle_map_.end())
     return scoped_ptr<cc::SharedBitmap>();
 
@@ skipping 100 matching lines @@
   base::hash_set<cc::SharedBitmapId>& res = proc_it->second;
 
   for (base::hash_set<cc::SharedBitmapId>::iterator it = res.begin();
        it != res.end();
        ++it) {
     handle_map_.erase(*it);
   }
   process_map_.erase(proc_it);
 }
 
+void HostSharedBitmapManager::FreeSharedMemoryFromMap(
+    cc::SharedBitmap* bitmap) {
+  base::AutoLock lock(lock_);
+  handle_map_.erase(bitmap->id());
+}
+
 }  // namespace content