Update from https://crrev.com/306655

cc/resources/shared_bitmap.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 "cc/resources/shared_bitmap.h"
 
 #include "base/logging.h"
 #include "base/numerics/safe_math.h"
 #include "base/rand_util.h"
 
 namespace cc {
 
-SharedBitmap::SharedBitmap(
-    base::SharedMemory* memory,
-    const SharedBitmapId& id,
-    const base::Callback<void(SharedBitmap* bitmap)>& free_callback)
-    : memory_(memory),
-      pixels_(static_cast<uint8*>(memory_->memory())),
-      id_(id),
-      free_callback_(free_callback) {
+SharedBitmap::SharedBitmap(uint8* pixels, const SharedBitmapId& id)
+    : pixels_(pixels), id_(id) {
 }
 
-SharedBitmap::SharedBitmap(
-    uint8* pixels,
-    const SharedBitmapId& id,
-    const base::Callback<void(SharedBitmap* bitmap)>& free_callback)
-    : memory_(NULL), pixels_(pixels), id_(id), free_callback_(free_callback) {
+SharedBitmap::~SharedBitmap() {
 }
 
-SharedBitmap::~SharedBitmap() { free_callback_.Run(this); }
-
 // static
 bool SharedBitmap::SizeInBytes(const gfx::Size& size, size_t* size_in_bytes) {
   if (size.IsEmpty())
     return false;
   base::CheckedNumeric<size_t> s = 4;
   s *= size.width();
   s *= size.height();
   if (!s.IsValid())
     return false;
   *size_in_bytes = s.ValueOrDie();
@@ skipping 30 matching lines @@
 
 // static
 SharedBitmapId SharedBitmap::GenerateId() {
   SharedBitmapId id;
   // Needs cryptographically-secure random numbers.
   base::RandBytes(id.name, sizeof(id.name));
   return id;
 }
 
 }  // namespace cc