[Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

chrome/browser/extensions/extension_action_icon_factory.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/profiles/profile.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 23 matching lines @@
   if (observer_)
     observer_->OnIconUpdated();
 }
 
 void ExtensionActionIconFactory::OnExtensionIconImageDestroyed(
     IconImage* image) {
   icon_image_observer_.RemoveAll();
 }
 
 gfx::Image ExtensionActionIconFactory::GetIcon(int tab_id) {
-  return gfx::Image(GetBaseIconFromAction(tab_id));
-}
-
-gfx::ImageSkia ExtensionActionIconFactory::GetBaseIconFromAction(int tab_id) {
-  gfx::ImageSkia icon = action_->GetExplicitlySetIcon(tab_id);
-  if (!icon.isNull())
+  gfx::Image icon = action_->GetExplicitlySetIcon(tab_id);
+  if (!icon.IsEmpty())
     return icon;
 
   icon = action_->GetDeclarativeIcon(tab_id);
-  if (!icon.isNull())
+  if (!icon.IsEmpty())
     return icon;
 
   return action_->GetDefaultIconImage();
 }