Add support for multiple icon sizes for Mac platform apps

chrome/browser/extensions/extension_icon_manager_unittest.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 "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 58 matching lines @@
 // This is a specialization of ExtensionIconManager, with a special override to
 // call back to the test when an icon has completed loading.
 class TestIconManager : public ExtensionIconManager {
  public:
   explicit TestIconManager(ExtensionIconManagerTest* test) : test_(test) {}
   virtual ~TestIconManager() {}
 
   // Implements the ImageLoadingTracker::Observer interface, and calls through
   // to the base class' implementation. Then it lets the test know that an
   // image load was observed.
-  virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
-                             int index) {
-    ExtensionIconManager::OnImageLoaded(image, resource, index);
+  virtual void OnImageLoaded(const gfx::Image& image,
+                             const std::string& extension_id,
+                             int index) OVERRIDE {
+    ExtensionIconManager::OnImageLoaded(image, extension_id, index);
     test_->ImageLoadObserved();
   }
 
  private:
   ExtensionIconManagerTest* test_;
 
   DISALLOW_COPY_AND_ASSIGN(TestIconManager);
 };
 
 // Returns the default icon that ExtensionIconManager gives when an extension
@@ skipping 37 matching lines @@
 
   // Now re-load the icon - we should get the same result bitmap (and not the
   // default icon).
   icon_manager.LoadIcon(extension.get());
   WaitForImageLoad();
   SkBitmap second_icon = icon_manager.GetIcon(extension->id());
   EXPECT_FALSE(gfx::BitmapsAreEqual(second_icon, default_icon));
 
   EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));
 }