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

chrome/browser/ui/webui/extensions/extension_icon_source.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/ui/webui/extensions/extension_icon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
@@ skipping 108 matching lines @@
     return;
   }
 
   ExtensionIconRequest* request = GetData(request_id);
   ExtensionResource icon =
       request->extension->GetIconResource(request->size, request->match);
 
   if (icon.relative_path().empty()) {
     LoadIconFailed(request_id);
   } else {
+    if (request->extension->location() == Extension::COMPONENT &&
+        TryLoadingComponentExtensionImage(icon, request_id)) {
+      return;
+    }
     LoadExtensionImage(icon, request_id);
   }
 }
 
 void ExtensionIconSource::LoadIconFailed(int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
   ExtensionResource icon =
       request->extension->GetIconResource(request->size, request->match);
 
   if (request->size == ExtensionIconSet::EXTENSION_ICON_BITTY)
@@ skipping 54 matching lines @@
 
   // There are cases where Resize returns an empty bitmap, for example if you
   // ask for an image too large. In this case it is better to return the default
   // image than returning nothing at all.
   if (resized_image.empty())
     resized_image = *default_image;
 
   FinalizeImage(&resized_image, request_id);
 }
 
+bool ExtensionIconSource::TryLoadingComponentExtensionImage(
+    const ExtensionResource& icon, int request_id) {
+  ExtensionIconRequest* request = GetData(request_id);
+  FilePath directory_path = request->extension->path();
+  FilePath relative_path = directory_path.BaseName().Append(
+      icon.relative_path());
+  for (size_t i = 0; i < kComponentExtensionResourcesSize; ++i) {
+    FilePath bm_resource_path =
+        FilePath().AppendASCII(kComponentExtensionResources[i].name);
+    bm_resource_path = bm_resource_path.NormalizePathSeparators();
+    if (relative_path == bm_resource_path) {
+      scoped_ptr<SkBitmap> decoded(LoadImageByResourceId(
+          kComponentExtensionResources[i].value));
+      FinalizeImage(decoded.get(), request_id);
+      return true;
+    }
+  }
+  return false;
+}
+
 void ExtensionIconSource::LoadExtensionImage(const ExtensionResource& icon,
                                              int request_id) {
   ExtensionIconRequest* request = GetData(request_id);
   tracker_map_[next_tracker_id_++] = request_id;
   tracker_->LoadImage(request->extension,
                       icon,
                       gfx::Size(request->size, request->size),
                       ImageLoadingTracker::DONT_CACHE);
 }
 
@@ skipping 123 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }