[Autofill] Fixes a bug where all autofill suggestions have generic-cc icon

Bug:763499

after: https://drive.google.com/file/d/0B-GXJsF3pXyjRm4zbHVsaTFfSGs/view?usp=sharing
before: https://drive.google.com/file/d/0B-GXJsF3pXyjWUx5MG81QWFKNnM/view?usp=sharing

Change-Id: Iba3625cf83a626b38c4cf338650d0c98f06f674d
Reviewed-on: https://chromium-review.googlesource.com/664217Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501623}

ios/chrome/browser/autofill/form_suggestion_label.mm

@@ -92,17 +92,19 @@ UILabel* TextLabel(NSString* text, CGFloat alpha, BOOL bold) {
     const CGFloat frameHeight = CGRectGetHeight(proposedFrame);
     CGFloat currentX = kBorderWidth;
 
-    const int iconImageID = autofill::data_util::GetPaymentRequestData(
-                                base::SysNSStringToUTF8(suggestion.icon))
-                                .icon_resource_id;
-    UIImage* iconImage = NativeImage(iconImageID);
-    UIImageView* iconView = [[UIImageView alloc] initWithImage:iconImage];
-    const CGFloat iconY =
-        std::floor((frameHeight - iconImage.size.height) / 2.0f);
-    iconView.frame = CGRectMake(currentX, iconY, iconImage.size.width,
-                                iconImage.size.height);
-    [self addSubview:iconView];
-    currentX += CGRectGetWidth(iconView.frame) + kSpacing;
+    if (suggestion.icon.length > 0) {
+      const int iconImageID = autofill::data_util::GetPaymentRequestData(
+                                  base::SysNSStringToUTF8(suggestion.icon))
+                                  .icon_resource_id;
+      UIImage* iconImage = NativeImage(iconImageID);
+      UIImageView* iconView = [[UIImageView alloc] initWithImage:iconImage];
+      const CGFloat iconY =
+          std::floor((frameHeight - iconImage.size.height) / 2.0f);
+      iconView.frame = CGRectMake(currentX, iconY, iconImage.size.width,
+                                  iconImage.size.height);
+      [self addSubview:iconView];
+      currentX += CGRectGetWidth(iconView.frame) + kSpacing;
+    }
 
     UILabel* label = TextLabel(suggestion.value, kMainLabelAlpha, YES);
     const CGFloat labelY =