status tray: Use explicit conversion from ImageSkia to SkBitmap.

chrome/browser/media/media_stream_capture_indicator.cc

Index: chrome/browser/media/media_stream_capture_indicator.cc
diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc
index 88e1a38ee79e0aa165fbaf94178e31e6a1168d21..70aea7c3ef00e28a908b792793421aa38e358081 100644
--- a/chrome/browser/media/media_stream_capture_indicator.cc
+++ b/chrome/browser/media/media_stream_capture_indicator.cc
@@ -285,7 +285,7 @@ void MediaStreamCaptureIndicator::ShowBalloon(
   string16 title = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
   string16 body = l10n_util::GetStringFUTF16(message_id,
       GetSecurityOrigin(render_process_id, render_view_id));
-  status_icon_->DisplayBalloon(*balloon_image_, title, body);
+  status_icon_->DisplayBalloon(*balloon_image_->bitmap(), title, body);
 }
 
 void MediaStreamCaptureIndicator::OnImageLoaded(
@@ -296,12 +296,10 @@ void MediaStreamCaptureIndicator::OnImageLoaded(
   message.swap(pending_messages_[index]);
   pending_messages_.erase(index);
 
-  status_icon_->DisplayBalloon(
-      !image.IsEmpty() ? *image.ToImageSkia() :
-          *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-              IDR_APP_DEFAULT_ICON),
-      string16(),
-      message);
+  const gfx::ImageSkia* image_skia = !image.IsEmpty() ? image.ToImageSkia() :
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_APP_DEFAULT_ICON);
+  status_icon_->DisplayBalloon(*image_skia->bitmap(), string16(), message);
 }
 
 void MediaStreamCaptureIndicator::Hide() {
@@ -370,13 +368,13 @@ void MediaStreamCaptureIndicator::UpdateStatusTrayIconDisplay(
   int message_id = 0;
   if (audio && video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO;
-    status_icon_->SetImage(*camera_image_);
+    status_icon_->SetImage(*camera_image_->bitmap());
   } else if (audio && !video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY;
-    status_icon_->SetImage(*mic_image_);
+    status_icon_->SetImage(*mic_image_->bitmap());
   } else if (!audio && video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY;
-    status_icon_->SetImage(*camera_image_);
+    status_icon_->SetImage(*camera_image_->bitmap());
   }
 
   status_icon_->SetToolTip(l10n_util::GetStringFUTF16(