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

chrome/browser/extensions/extension_action_storage_manager.cc

 // Copyright 2014 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_storage_manager.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 151 matching lines @@
   dict->SetString(kTitleStorageKey, action->GetTitle(kDefaultTabId));
   dict->SetString(kBadgeTextStorageKey, action->GetBadgeText(kDefaultTabId));
   dict->SetString(
       kBadgeBackgroundColorStorageKey,
       SkColorToRawString(action->GetBadgeBackgroundColor(kDefaultTabId)));
   dict->SetString(kBadgeTextColorStorageKey,
                   SkColorToRawString(action->GetBadgeTextColor(kDefaultTabId)));
   dict->SetInteger(kAppearanceStorageKey,
                    action->GetIsVisible(kDefaultTabId) ? ACTIVE : INVISIBLE);
 
-  gfx::ImageSkia icon = action->GetExplicitlySetIcon(kDefaultTabId);
+  gfx::ImageSkia icon =
+      action->GetExplicitlySetIcon(kDefaultTabId).AsImageSkia();
   if (!icon.isNull()) {
     scoped_ptr<base::DictionaryValue> icon_value(new base::DictionaryValue());
     for (size_t i = 0; i < extension_misc::kNumExtensionActionIconSizes; i++) {
       const extension_misc::IconRepresentationInfo& icon_info =
           extension_misc::kExtensionActionIconSizes[i];
       float scale = ui::GetScaleForScaleFactor(icon_info.scale);
       if (icon.HasRepresentation(scale)) {
         icon_value->SetString(icon_info.size_string,
                               RepresentationToString(icon, scale));
       }
@@ skipping 87 matching lines @@
     return;
 
   SetDefaultsFromValue(dict, browser_action);
 }
 
 StateStore* ExtensionActionStorageManager::GetStateStore() {
   return ExtensionSystem::Get(browser_context_)->state_store();
 }
 
 }  // namespace extensions