Revert 133427 - Attempt to load component extension favicon from the resources first.

This broke BackgroundApplicationListModelTest.ExplicitTest.

Special handling of CWS icon.
Also correctly handle URL rewrites in favicon requests.

BUG=chromium-os:28314,chromium:120471
TEST=Observe the right favicon for CWS and FileManager component extension. Bookmark them and see the right favicon.
Review URL: https://chromiumcodereview.appspot.com/9979001

TBR=dgozman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10186001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133428 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 11 deletions

diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index be89d34..96e6513 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -9,7 +9,6 @@
 #include <map>
 
 #include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_observer.h"
@@ -123,13 +122,6 @@ class ImageLoadingTracker : public content::NotificationObserver {
   void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
                      const gfx::Size& original_size, 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 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,
@@ -151,9 +143,6 @@ class ImageLoadingTracker : public content::NotificationObserver {
 
   content::NotificationRegistrar registrar_;
 
-  FRIEND_TEST_ALL_PREFIXES(ImageLoadingTrackerTest,
-                           IsComponentExtensionResource);
-
   DISALLOW_COPY_AND_ASSIGN(ImageLoadingTracker);
 };