[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 52 matching lines @@
 
   [[closeButton_ cell] setImageID:IDR_CLOSE_1
                    forButtonState:image_button_cell::kDefaultState];
   [[closeButton_ cell] setImageID:IDR_CLOSE_1_H
                    forButtonState:image_button_cell::kHoverState];
   [[closeButton_ cell] setImageID:IDR_CLOSE_1_P
                    forButtonState:image_button_cell::kPressedState];
   [[closeButton_ cell] setImageID:IDR_CLOSE_1
                    forButtonState:image_button_cell::kDisabledState];
 
-  if (delegate_->GetIcon()) {
-    [image_ setImage:delegate_->GetIcon()->ToNSImage()];
+  if (!delegate_->GetIcon().IsEmpty()) {
+    [image_ setImage:delegate_->GetIcon().ToNSImage()];
   } else {
     // No icon, remove it from the view and grow the textfield to include the
     // space.
     NSRect imageFrame = [image_ frame];
     NSRect labelFrame = [labelPlaceholder_ frame];
     labelFrame.size.width += NSMinX(imageFrame) - NSMinX(labelFrame);
     labelFrame.origin.x = imageFrame.origin.x;
     [image_ removeFromSuperview];
     image_ = nil;
     [labelPlaceholder_ setFrame:labelFrame];
@@ skipping 184 matching lines @@
   if (!windowController) {
     // This should only happen in unit tests.
     return NSZeroPoint;
   }
 
   LocationBarViewMac* locationBar = [windowController locationBarBridge];
   return locationBar->GetPageInfoBubblePoint();
 }
 
 @end