Fix crashes due to gfx::Image unsafe thread passing

components/enhanced_bookmarks/persistent_image_store.cc

 // Copyright 2014 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 "components/enhanced_bookmarks/persistent_image_store.h"
 
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "components/enhanced_bookmarks/image_store_util.h"
 #include "sql/statement.h"
@@ skipping 145 matching lines @@
       "SELECT COUNT(*) FROM images_by_url WHERE page_url = ?"));
   statement.BindString(0, page_url.possibly_invalid_spec());
 
   int count = statement.Step() ? statement.ColumnInt(0) : 0;
 
   return !!count;
 }
 
 void PersistentImageStore::Insert(
     const GURL& page_url,
-    const enhanced_bookmarks::ImageRecord& record) {
+    scoped_refptr<enhanced_bookmarks::ImageRecord> record) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return;
 
   Erase(page_url);  // Remove previous image for this url, if any.
   sql::Statement statement(db_.GetCachedStatement(
       SQL_FROM_HERE,
       "INSERT INTO images_by_url "
       "(page_url, image_url, image_data, width, height, image_dominant_color)"
       "VALUES (?, ?, ?, ?, ?, ?)"));
 
   statement.BindString(0, page_url.possibly_invalid_spec());
-  statement.BindString(1, record.url.possibly_invalid_spec());
+  statement.BindString(1, record->url.possibly_invalid_spec());
 
   scoped_refptr<base::RefCountedMemory> image_bytes =
-      enhanced_bookmarks::BytesForImage(record.image);
+      enhanced_bookmarks::BytesForImage(*record->image);
 
   // Insert an empty image in case encoding fails.
   if (!image_bytes.get())
     image_bytes = enhanced_bookmarks::BytesForImage(gfx::Image());
 
   CHECK(image_bytes.get());
 
   statement.BindBlob(2, image_bytes->front(), (int)image_bytes->size());
 
-  statement.BindInt(3, record.image.Size().width());
-  statement.BindInt(4, record.image.Size().height());
-  statement.BindInt(5, record.dominant_color);
+  statement.BindInt(3, record->image->Size().width());
+  statement.BindInt(4, record->image->Size().height());
+  statement.BindInt(5, record->dominant_color);
   statement.Run();
 }
 
 void PersistentImageStore::Erase(const GURL& page_url) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM images_by_url WHERE page_url = ?"));
   statement.BindString(0, page_url.possibly_invalid_spec());
   statement.Run();
 }
 
-enhanced_bookmarks::ImageRecord PersistentImageStore::Get(
+scoped_refptr<enhanced_bookmarks::ImageRecord> PersistentImageStore::Get(
     const GURL& page_url) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
-  enhanced_bookmarks::ImageRecord image_record;
+  scoped_refptr<enhanced_bookmarks::ImageRecord> image_record(
+      new enhanced_bookmarks::ImageRecord());
   if (OpenDatabase() != sql::INIT_OK)
     return image_record;
 
   bool stored_image_record_needs_update = false;
 
   // Scope the SELECT statement.
   {
     sql::Statement statement(db_.GetCachedStatement(
         SQL_FROM_HERE,
         "SELECT image_data, image_url, image_dominant_color FROM images_by_url "
         "WHERE page_url = ?"));
 
     statement.BindString(0, page_url.possibly_invalid_spec());
 
     if (!statement.Step())
       return image_record;
 
     // Image.
     if (statement.ColumnByteLength(0) > 0) {
       scoped_refptr<base::RefCountedBytes> data(new base::RefCountedBytes());
       statement.ColumnBlobAsVector(0, &data->data());
-      image_record.image = enhanced_bookmarks::ImageForBytes(data);
+      *image_record->image = enhanced_bookmarks::ImageForBytes(data);
     }
 
     // URL.
-    image_record.url = GURL(statement.ColumnString(1));
+    image_record->url = GURL(statement.ColumnString(1));
 
     // Dominant color.
     if (statement.ColumnType(2) != sql::COLUMN_TYPE_NULL) {
-      image_record.dominant_color = SkColor(statement.ColumnInt(2));
+      image_record->dominant_color = SkColor(statement.ColumnInt(2));
     } else {
       // The dominant color was not computed when the image was first
       // stored.
       // Compute it now.
-      image_record.dominant_color =
-          enhanced_bookmarks::DominantColorForImage(image_record.image);
+      image_record->dominant_color =
+          enhanced_bookmarks::DominantColorForImage(*image_record->image);
       stored_image_record_needs_update = true;
     }
 
     // Make sure there is only one record for page_url.
     DCHECK(!statement.Step());
   }
 
   if (stored_image_record_needs_update) {
     Erase(page_url);
     Insert(page_url, image_record);
@@ skipping 69 matching lines @@
 
     // Can't open, raze().
     if (db_.is_open())
       db_.Raze();
     db_.Close();
   }
 
   DCHECK(false) << "Can't open image DB";
   return sql::INIT_FAILURE;
 }