Make some updates to extension iconography.

chrome/browser/extensions/menu_manager.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/menu_manager.h"
 
 #include <algorithm>
 #include <memory>
 #include <tuple>
 #include <utility>
@@ skipping 854 matching lines @@
   Profile* profile = content::Source<Profile>(source).ptr();
   // We cannot use profile_->HasOffTheRecordProfile as it may already be
   // false at this point, if for example the incognito profile was destroyed
   // using DestroyOffTheRecordProfile.
   if (profile->GetOriginalProfile() == browser_context_ &&
       profile->GetOriginalProfile() != profile) {
     RemoveAllIncognitoContextItems();
   }
 }
 
-const SkBitmap& MenuManager::GetIconForExtension(
-    const std::string& extension_id) {
+gfx::Image MenuManager::GetIconForExtension(const std::string& extension_id) {
   return icon_manager_.GetIcon(extension_id);
 }
 
 void MenuManager::RemoveAllIncognitoContextItems() {
   // Get all context menu items with "incognito" set to "split".
   std::set<MenuItem::Id> items_to_remove;
   for (auto iter = items_by_id_.begin(); iter != items_by_id_.end(); ++iter) {
     if (iter->first.incognito)
       items_to_remove.insert(iter->first);
   }
@@ skipping 78 matching lines @@
 bool MenuItem::Id::operator!=(const Id& other) const {
   return !(*this == other);
 }
 
 bool MenuItem::Id::operator<(const Id& other) const {
   return std::tie(incognito, extension_key, uid, string_uid) <
     std::tie(other.incognito, other.extension_key, other.uid, other.string_uid);
 }
 
 }  // namespace extensions