Fix crashes due to gfx::Image unsafe thread passing

components/enhanced_bookmarks/image_store_ios_unittest.mm

 // 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/image_store.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "components/enhanced_bookmarks/image_record.h"
 #include "components/enhanced_bookmarks/image_store_util.h"
 #include "components/enhanced_bookmarks/persistent_image_store.h"
 #include "components/enhanced_bookmarks/test_image_store.h"
 #include "testing/platform_test.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Generates a gfx::Image with a random UIImage representation. Uses off-center
 // circle gradient to make all pixels slightly different in order to detect
 // small image alterations.
-gfx::Image GenerateRandomUIImage(const gfx::Size& size, float scale) {
+scoped_ptr<gfx::Image> GenerateRandomUIImage(const gfx::Size& size,
+                                             float scale) {
   UIGraphicsBeginImageContextWithOptions(CGSizeMake(size.width(),
                                                     size.height()),
                                          YES,  // opaque.
                                          scale);
   // Create the gradient's colors.
   CGFloat locations[] = { 0.0, 1.0 };
   CGFloat components[] = { rand()/CGFloat(RAND_MAX),  // Start color r
                            rand()/CGFloat(RAND_MAX),  // g
                            rand()/CGFloat(RAND_MAX),  // b
                            1.0,                       // Alpha
@@ skipping 13 matching lines @@
                                                    arraysize(locations)));
   CGContextDrawRadialGradient(UIGraphicsGetCurrentContext(),
                               gradient,
                               center,
                               0,
                               center,
                               radius,
                               kCGGradientDrawsAfterEndLocation);
   UIImage* image = UIGraphicsGetImageFromCurrentImageContext();
   UIGraphicsEndImageContext();
-  return gfx::Image([image retain]);
+  return scoped_ptr<gfx::Image>(new gfx::Image([image retain]));
 }
 
 // Returns true if the two images are identical.
 bool CompareImages(const gfx::Image& image_1, const gfx::Image& image_2) {
   if (image_1.IsEmpty() && image_2.IsEmpty())
     return true;
   if (image_1.IsEmpty() || image_2.IsEmpty())
     return false;
 
   scoped_refptr<base::RefCountedMemory> image_1_bytes =
@@ skipping 64 matching lines @@
 typedef testing::Types<TestImageStore,
                        PersistentImageStore> Implementations;
 
 TYPED_TEST_CASE(ImageStoreUnitTestIOS, Implementations);
 
 TYPED_TEST(ImageStoreUnitTestIOS, StoringImagesPreservesScale) {
   const CGFloat scales[] = {0.0, 1.0, 2.0};
   const gfx::Size image_size(42, 24);
   for (unsigned long i = 0; i < arraysize(scales); i++) {
     const GURL url("foo://bar");
-    const enhanced_bookmarks::ImageRecord image_in(
-        GenerateRandomUIImage(image_size, scales[i]), GURL("http://a.jpg"),
-        SK_ColorGREEN);
+    scoped_refptr<enhanced_bookmarks::ImageRecord> image_in(
+        new enhanced_bookmarks::ImageRecord(
+            GenerateRandomUIImage(image_size, scales[i]),
+            GURL("http://a.jpg"),
+            SK_ColorGREEN));
     this->store_->Insert(url, image_in);
-    const enhanced_bookmarks::ImageRecord image_out = this->store_->Get(url);
+    scoped_refptr<enhanced_bookmarks::ImageRecord> image_out =
+        this->store_->Get(url);
 
-    EXPECT_EQ(image_in.url, image_out.url);
-    EXPECT_TRUE(CompareImages(image_in.image, image_out.image));
-    EXPECT_EQ(image_in.dominant_color, image_out.dominant_color);
+    EXPECT_EQ(image_in->url, image_out->url);
+    EXPECT_TRUE(CompareImages(*image_in->image, *image_out->image));
+    EXPECT_EQ(image_in->dominant_color, image_out->dominant_color);
   }
 }
 
 }  // namespace