extensions: Fix crash on empty extension action icons

chrome/browser/extensions/api/extension_action/extension_actions_api.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/api/extension_action/extension_actions_api.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/string_number_conversions.h"
@@ skipping 86 matching lines @@
   if (dict->GetString(kBadgeTextStorageKey, &str_value))
     action->SetBadgeText(kTabId, str_value);
   if (dict->GetString(kBadgeBackgroundColorStorageKey, &str_value))
     action->SetBadgeBackgroundColor(kTabId, RawStringToSkColor(str_value));
   if (dict->GetString(kBadgeTextColorStorageKey, &str_value))
     action->SetBadgeTextColor(kTabId, RawStringToSkColor(str_value));
   if (dict->GetInteger(kAppearanceStorageKey, &int_value))
     action->SetAppearance(kTabId,
                           static_cast<ExtensionAction::Appearance>(int_value));
   if (dict->GetString(kIconStorageKey, &str_value) &&
-      StringToSkBitmap(str_value, &bitmap))
-    action->SetIcon(kTabId, bitmap);
+      StringToSkBitmap(str_value, &bitmap)) {
+    CHECK(!bitmap.isNull());
+    action->SetIcon(kTabId, gfx::Image(bitmap));
+  }
 }
 
 // Store |action|'s default values in a DictionaryValue for use in storing to
 // disk.
 scoped_ptr<base::DictionaryValue> DefaultsToValue(ExtensionAction* action) {
   const int kTabId = ExtensionAction::kDefaultTabId;
   scoped_ptr<base::DictionaryValue> dict(new DictionaryValue());
 
   dict->SetString(kPopupUrlStorageKey, action->GetPopupUrl(kTabId).spec());
   dict->SetString(kTitleStorageKey, action->GetTitle(kTabId));
@@ skipping 283 matching lines @@
 bool ExtensionActionSetIconFunction::RunExtensionAction() {
   // setIcon can take a variant argument: either a canvas ImageData, or an
   // icon index.
   base::BinaryValue* binary = NULL;
   int icon_index;
   if (details_->GetBinary("imageData", &binary)) {
     IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
     PickleIterator iter(bitmap_pickle);
     SkBitmap bitmap;
     EXTENSION_FUNCTION_VALIDATE(IPC::ReadParam(&bitmap_pickle, &iter, &bitmap));
-    extension_action_->SetIcon(tab_id_, bitmap);
+    CHECK(!bitmap.isNull());
+    extension_action_->SetIcon(tab_id_, gfx::Image(bitmap));
   } else if (details_->GetInteger("iconIndex", &icon_index)) {
     // If --enable-script-badges is on there might legitimately be an iconIndex
     // set. Until we decide what to do with that, ignore.
     if (!GetExtension()->page_action())
       return true;
     if (icon_index < 0 ||
         static_cast<size_t>(icon_index) >=
             extension_action_->icon_paths()->size()) {
       error_ = kIconIndexOutOfBounds;
       return false;
     }
-    extension_action_->SetIcon(tab_id_, SkBitmap());
+    extension_action_->SetIcon(tab_id_, gfx::Image());
     extension_action_->SetIconIndex(tab_id_, icon_index);
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
   NotifyChange();
   return true;
 }
 
 bool ExtensionActionSetTitleFunction::RunExtensionAction() {
   std::string title;
@@ skipping 71 matching lines @@
 bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
   ListValue* list = new ListValue();
   SkColor color = extension_action_->GetBadgeBackgroundColor(tab_id_);
   list->Append(Value::CreateIntegerValue(SkColorGetR(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetG(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetB(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetA(color)));
   SetResult(list);
   return true;
 }