Update from https://crrev.com/308331

cc/resources/shared_bitmap.h

Index: cc/resources/shared_bitmap.h
diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h
index bbf0823286debb7259876ccc2590a1cd73aff7aa..6980afbc11265a32b3f127fc4af927970380ada4 100644
--- a/cc/resources/shared_bitmap.h
+++ b/cc/resources/shared_bitmap.h
@@ -6,13 +6,10 @@
 #define CC_RESOURCES_SHARED_BITMAP_H_
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace base { class SharedMemory; }
-
 namespace cc {
 typedef gpu::Mailbox SharedBitmapId;
 
@@ -24,8 +21,6 @@ class CC_EXPORT SharedBitmap {
 
   uint8* pixels() { return pixels_; }
 
-  virtual base::SharedMemory* memory() = 0;
-
   const SharedBitmapId& id() { return id_; }
 
   // Returns true if the size is valid and false otherwise.