Give Chrome Web Store app an icon in its manifest file.

chrome/browser/extensions/image_loading_tracker.h

Index: chrome/browser/extensions/image_loading_tracker.h
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index be631e7a647acdaa0c91b90f0e81c2aa8e2dfbff..5eefcd1840f2a66637a06a13204562ae1f476b04 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -96,11 +96,6 @@ class ImageLoadingTracker : public content::NotificationObserver {
     ui::ScaleFactor scale_factor;
   };
 
-  // Returns true if given extension id is a special component extension that
-  // has its resource bundled.
-  // TODO(xiyuan): Move this out of this class.
-  static bool IsSpecialBundledExtensionId(const std::string& extension_id);
-
   explicit ImageLoadingTracker(Observer* observer);
   virtual ~ImageLoadingTracker();
 
@@ -127,6 +122,14 @@ class ImageLoadingTracker : public content::NotificationObserver {
   // OnImageLoaded() the next time LoadImage() is invoked.
   int next_id() const { return next_id_; }
 
+  // Checks whether image is a component extension resource. Returns false
+  // if a given |resource| does not have a corresponding image in bundled
+  // resources. Otherwise fills |resource_id|.
+  static bool IsComponentExtensionResource(
+      const extensions::Extension* extension,
+      const FilePath& resource_path,
+      int* resource_id);
+
  private:
   // Information for pending resource load operation for one or more image
   // representations.
@@ -156,13 +159,6 @@ class ImageLoadingTracker : public content::NotificationObserver {
                       int id,
                       bool should_cache);
 
-  // Checks whether image is a component extension resource. Returns false
-  // if a given |resource| does not have a corresponding image in bundled
-  // resources. Otherwise fills |resource_id|.
-  bool IsComponentExtensionResource(const extensions::Extension* extension,
-                                    const ExtensionResource& resource,
-                                    int& resource_id) const;
-
   // content::NotificationObserver method. If an extension is uninstalled while
   // we're waiting for the image we remove the entry from load_map_.
   virtual void Observe(int type,
@@ -184,9 +180,6 @@ class ImageLoadingTracker : public content::NotificationObserver {
 
   content::NotificationRegistrar registrar_;
 
-  FRIEND_TEST_ALL_PREFIXES(ImageLoadingTrackerTest,
-                           IsComponentExtensionResource);
-
   DISALLOW_COPY_AND_ASSIGN(ImageLoadingTracker);
 };