Add custom icon support to GlobalError. Show extension icon in permissions increase bubble.

chrome/browser/ui/cocoa/global_error_bubble_controller.mm

Index: chrome/browser/ui/cocoa/global_error_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index 778881706ddd9816659a8d7e8285e169127d76ae..c8b5d3b48b056b9f7881dc99d8d6d15503dfdeeb 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -23,7 +23,6 @@
 #include "grit/generated_resources.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
@@ -83,9 +82,9 @@ class Bridge : public GlobalErrorBubbleViewBase {
 
   DCHECK(error_);
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  [iconView_ setImage:rb.GetNativeImageNamed(
-      error_->GetBubbleViewIconResourceID()).ToNSImage()];
+  gfx::Image image = error_->GetBubbleViewIcon();
+  DCHECK(!image.IsEmpty());
+  [iconView_ setImage:image.ToNSImage()];
 
   [title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())];
   std::vector<string16> messages = error_->GetBubbleViewMessages();