Fix crashes due to gfx::Image unsafe thread passing

components/enhanced_bookmarks/image_record.h

Index: components/enhanced_bookmarks/image_record.h
diff --git a/components/enhanced_bookmarks/image_record.h b/components/enhanced_bookmarks/image_record.h
index dde32513ce7942f6b3e9b6285f4bc47371487903..e93f3b83ff422f7ff2ee3091c686f0cd912fef82 100644
--- a/components/enhanced_bookmarks/image_record.h
+++ b/components/enhanced_bookmarks/image_record.h
@@ -5,6 +5,7 @@
 #ifndef COMPONENTS_ENHANCED_BOOKMARKS_IMAGE_RECORD_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_IMAGE_RECORD_H_
 
+#include "base/memory/ref_counted.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
@@ -12,17 +13,25 @@
 namespace enhanced_bookmarks {
 
 // Defines a record of a bookmark image in the ImageStore.
-struct ImageRecord {
-  ImageRecord() : image(), url(), dominant_color(SK_ColorBLACK) {}
-  ImageRecord(const gfx::Image& image, const GURL& url, SkColor dominant_color)
-      : image(image), url(url), dominant_color(dominant_color) {}
+class ImageRecord :  public base::RefCountedThreadSafe<ImageRecord> {
+ public:
+  ImageRecord(scoped_ptr<gfx::Image> image,
+              const GURL& url,
+              SkColor dominant_color);
+  ImageRecord(scoped_ptr<gfx::Image> image, const GURL& url);
+  ImageRecord();
 
   // The image data.
-  gfx::Image image;
+  scoped_ptr<gfx::Image> image;
   // The URL that hosts the image.
   GURL url;
   // The dominant color of the image.
   SkColor dominant_color;
+
+ private:
+  friend class base::RefCountedThreadSafe<ImageRecord>;
+
+  ~ImageRecord();
 };
 
 }  // namespace enhanced_bookmarks