Adding iOS support for image_store.

BUG=None
TBR=blundell@chromium.com

Review URL: https://codereview.chromium.org/347513003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278482 0039d316-1c4b-4281-b951-d872f2087c98

components/components_tests.gyp

@@ -99,6 +99,7 @@
             'domain_reliability/test_util.h',
             'domain_reliability/uploader_unittest.cc',
             'domain_reliability/util_unittest.cc',
+            'enhanced_bookmarks/image_store_ios_unittest.mm',
             'enhanced_bookmarks/image_store_unittest.cc',
             'feedback/feedback_common_unittest.cc',
             'feedback/feedback_data_unittest.cc',
@@ -410,6 +411,7 @@
                 ['include', '^bookmarks/'],
                 ['include', '^data_reduction_proxy/'],
                 ['include', '^dom_distiller/'],
+                ['include', '^enhanced_bookmarks/'],
                 ['include', '^gcm_driver/'],
                 ['include', '^history/'],
                 ['include', '^invalidation/'],

components/enhanced_bookmarks.gypi

@@ -21,6 +21,7 @@
         'enhanced_bookmarks/image_store.h',
         'enhanced_bookmarks/image_store_util.cc',
         'enhanced_bookmarks/image_store_util.h',
+        'enhanced_bookmarks/image_store_util_ios.mm',
         'enhanced_bookmarks/persistent_image_store.cc',
         'enhanced_bookmarks/persistent_image_store.h',
       ],

components/enhanced_bookmarks/image_store_ios_unittest.mm

@@ -0,0 +1,153 @@
+// 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_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(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
+                           rand()/CGFloat(RAND_MAX),  // End color r
+                           rand()/CGFloat(RAND_MAX),  // g
+                           rand()/CGFloat(RAND_MAX),  // b
+                           1.0 };                     // Alpha
+  CGPoint center = CGPointMake(size.width() / 3, size.height() / 3);
+  CGFloat radius = MAX(size.width(), size.height());
+
+  base::ScopedCFTypeRef<CGColorSpaceRef>
+      colorspace(CGColorSpaceCreateDeviceRGB());
+  base::ScopedCFTypeRef<CGGradientRef>
+      gradient(CGGradientCreateWithColorComponents(colorspace,
+                                                   components,
+                                                   locations,
+                                                   arraysize(locations)));
+  CGContextDrawRadialGradient(UIGraphicsGetCurrentContext(),
+                              gradient,
+                              center,
+                              0,
+                              center,
+                              radius,
+                              kCGGradientDrawsAfterEndLocation);
+  UIImage* image = UIGraphicsGetImageFromCurrentImageContext();
+  UIGraphicsEndImageContext();
+  return 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 =
+      enhanced_bookmarks::BytesForImage(image_1);
+  scoped_refptr<base::RefCountedMemory> image_2_bytes =
+      enhanced_bookmarks::BytesForImage(image_2);
+
+  if (image_1_bytes->size() != image_2_bytes->size())
+    return false;
+
+  return !memcmp(image_1_bytes->front(),
+                 image_2_bytes->front(),
+                 image_1_bytes->size());
+}
+
+// Factory functions for creating instances of the implementations.
+template <class T>
+ImageStore* CreateStore(base::ScopedTempDir& folder);
+
+template <>
+ImageStore* CreateStore<TestImageStore>(
+    base::ScopedTempDir& folder) {
+  return new TestImageStore();
+}
+
+template <>
+ImageStore* CreateStore<PersistentImageStore>(
+    base::ScopedTempDir& folder) {
+  return new PersistentImageStore(folder.path());
+}
+
+// Methods to check if persistence is on or not.
+template <class T> bool ShouldPersist();
+template <> bool ShouldPersist<TestImageStore>() { return false; }
+template <> bool ShouldPersist<PersistentImageStore>() { return true; }
+
+// Test fixture class template for the abstract API.
+template <class T>
+class ImageStoreUnitTestIOS : public PlatformTest {
+ protected:
+  ImageStoreUnitTestIOS() {}
+  virtual ~ImageStoreUnitTestIOS() {}
+
+  virtual void SetUp() OVERRIDE {
+    bool success = temp_dir_.CreateUniqueTempDir();
+    ASSERT_TRUE(success);
+    store_.reset(CreateStore<T>(temp_dir_));
+  }
+
+  virtual void TearDown() OVERRIDE {
+    if (store_ && use_persistent_store())
+      store_->ClearAll();
+  }
+
+  bool use_persistent_store() const { return ShouldPersist<T>(); }
+  void ResetStore() { store_.reset(CreateStore<T>(temp_dir_)); }
+
+  // The directory the database is saved into.
+  base::ScopedTempDir temp_dir_;
+  // The object the fixture is testing, via its base interface.
+  scoped_ptr<ImageStore> store_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ImageStoreUnitTestIOS);
+};
+
+// The list of implementations of the abstract API that are going to be tested.
+typedef testing::Types<TestImageStore,
+                       PersistentImageStore> Implementations;
+
+TYPED_TEST_CASE(ImageStoreUnitTestIOS, Implementations);
+
+TYPED_TEST(ImageStoreUnitTestIOS, StoringImagesPreservesScale) {
+  CGFloat scales[] = { 0.0, 1.0, 2.0 };
+  gfx::Size image_size(42, 24);
+  for (unsigned long i = 0; i < arraysize(scales); i++) {
+    gfx::Image src_image(GenerateRandomUIImage(image_size, scales[i]));
+    const GURL url("foo://bar");
+    const GURL image_url("a.jpg");
+    this->store_->Insert(url, image_url, src_image);
+    std::pair<gfx::Image, GURL> image_info = this->store_->Get(url);
+
+    EXPECT_EQ(image_url, image_info.second);
+    EXPECT_TRUE(CompareImages(src_image, image_info.first));
+  }
+}
+
+}  // namespace

components/enhanced_bookmarks/image_store_unittest.cc

@@ -15,21 +15,26 @@
 
 namespace {
 
-const SkBitmap CreateBitmap(int width, int height, int a, int r, int g, int b) {
+gfx::Image CreateImage(int width, int height, int a, int r, int g, int b) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(width, height);
   bitmap.eraseARGB(a, r, g, b);
-  return bitmap;
+  gfx::Image image(gfx::Image::CreateFrom1xBitmap(bitmap));
+
+#if defined(OS_IOS)
+  // Make sure the image has a kImageRepCocoaTouch.
+  image.ToUIImage();
+#endif  // defined(OS_IOS)
+
+  return image;
 }
 
 gfx::Image GenerateWhiteImage() {
-  return gfx::Image::CreateFrom1xBitmap(
-      CreateBitmap(42, 24, 255, 255, 255, 255));
+  return CreateImage(42, 24, 255, 255, 255, 255);
 }
 
 gfx::Image GenerateBlackImage(int width, int height) {
-  return gfx::Image::CreateFrom1xBitmap(
-      CreateBitmap(width, height, 255, 0, 0, 0));
+  return CreateImage(width, height, 255, 0, 0, 0);
 }
 
 gfx::Image GenerateBlackImage() {
@@ -44,17 +49,17 @@ bool CompareImages(const gfx::Image& image_1, const gfx::Image& image_2) {
   if (image_1.IsEmpty() || image_2.IsEmpty())
     return false;
 
-  scoped_refptr<base::RefCountedMemory> image_1_png =
+  scoped_refptr<base::RefCountedMemory> image_1_bytes =
       enhanced_bookmarks::BytesForImage(image_1);
-  scoped_refptr<base::RefCountedMemory> image_2_png =
+  scoped_refptr<base::RefCountedMemory> image_2_bytes =
       enhanced_bookmarks::BytesForImage(image_2);
 
-  if (image_1_png->size() != image_2_png->size())
+  if (image_1_bytes->size() != image_2_bytes->size())
     return false;
 
-  return !memcmp(image_1_png->front(),
-                 image_2_png->front(),
-                 image_1_png->size());
+  return !memcmp(image_1_bytes->front(),
+                 image_2_bytes->front(),
+                 image_1_bytes->size());
 }
 
 // Factory functions for creating instances of the implementations.
@@ -240,7 +245,7 @@ TYPED_TEST(ImageStoreUnitTest, GetSize) {
   }
 
   if (this->use_persistent_store()) {
-    EXPECT_GE(this->store_->GetStoreSizeInBytes(), 100 * 1024); // 100kb
+    EXPECT_GE(this->store_->GetStoreSizeInBytes(),  90 * 1024); //  90kb
     EXPECT_LE(this->store_->GetStoreSizeInBytes(), 200 * 1024); // 200kb
   } else {
     EXPECT_GE(this->store_->GetStoreSizeInBytes(), 400 * 1024); // 400kb

components/enhanced_bookmarks/image_store_util_ios.mm

@@ -0,0 +1,50 @@
+// 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_util.h"
+
+#import <UIKit/UIKit.h>
+
+#include "base/mac/scoped_cftyperef.h"
+#include "base/mac/scoped_nsobject.h"
+
+namespace {
+// An implementation of RefCountedMemory, where the bytes are stored in a
+// NSData. This class assumes the NSData is non mutable to avoid a copy.
+class RefCountedNSDataMemory : public base::RefCountedMemory {
+ public:
+  explicit RefCountedNSDataMemory(NSData* memory) : data_([memory retain]) {}
+
+  virtual const unsigned char* front() const OVERRIDE {
+    return reinterpret_cast<const unsigned char*>([data_ bytes]);
+  }
+
+  virtual size_t size() const OVERRIDE {
+    return [data_ length];
+  }
+
+private:
+  virtual ~RefCountedNSDataMemory() {}
+
+  base::scoped_nsobject<NSData> data_;
+  DISALLOW_COPY_AND_ASSIGN(RefCountedNSDataMemory);
+};
+}  // namespace
+
+namespace enhanced_bookmarks {
+
+// Encodes the UIImage representation of a gfx::Image.
+scoped_refptr<base::RefCountedMemory> BytesForImage(const gfx::Image& image) {
+  DCHECK(image.HasRepresentation(gfx::Image::kImageRepCocoaTouch));
+  return scoped_refptr<RefCountedNSDataMemory>(new RefCountedNSDataMemory(
+      [NSKeyedArchiver archivedDataWithRootObject:image.ToUIImage()]));
+}
+
+// Decodes the UIImage in the bytes and returns a gfx::Image.
+gfx::Image ImageForBytes(const scoped_refptr<base::RefCountedMemory>& data) {
+  return gfx::Image([[NSKeyedUnarchiver unarchiveObjectWithData:
+      [NSData dataWithBytes:data->front() length:data->size()]] retain]);
+}
+
+}  // namespace enhanced_bookmarks