Convert most of the rest of chrome to ImageSkia

chrome/browser/media/media_stream_capture_indicator.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 #pragma once
 
+#include <string>
 #include <vector>
-#include <string>
 
 #include "base/memory/ref_counted.h"
 #include "content/public/common/media_stream_request.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/gfx/image/image_skia.h"
 
 class StatusIcon;
 class StatusTray;
 
 // This indicator is owned by MediaInternals and deleted when MediaInternals
 // is deleted.
 class MediaStreamCaptureIndicator
     : public base::RefCountedThreadSafe<MediaStreamCaptureIndicator>,
       public ui::SimpleMenuModel::Delegate {
  public:
@@ skipping 97 matching lines @@
 
   // Updates the status tray tooltip with the new device list. This function is
   // called by UpdateStatusTrayIconContextMenu().
   void UpdateStatusTrayIconTooltip(bool audio, bool video);
 
   // Reference to our status icon - owned by the StatusTray. If null,
   // the platform doesn't support status icons.
   StatusIcon* status_icon_;
 
   // Icon to be displayed on the status tray.
-  SkBitmap tray_image_;
+  gfx::ImageSkia tray_image_;
 
-  SkBitmap balloon_image_;
+  gfx::ImageSkia balloon_image_;
 
   // A list that contains the usage information of the opened capture devices.
   typedef std::vector<CaptureDeviceTab> CaptureDeviceTabs;
   CaptureDeviceTabs tabs_;
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_