Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc

chrome/browser/icon_manager.cc

Index: chrome/browser/icon_manager.cc
diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc
index 2f1444e83d0d7e999d93a9e818c95fc0ea4db953..542fadc759eb0cca3871e2824cf7425768fb716c 100644
--- a/chrome/browser/icon_manager.cc
+++ b/chrome/browser/icon_manager.cc
@@ -27,7 +27,7 @@ void RunCallbackIfNotCanceled(
 
 struct IconManager::ClientRequest {
   IconRequestCallback callback;
-  IconGroupID group;
+  FilePath file_path;
   IconLoader::IconSize size;
 };
 
@@ -38,10 +38,9 @@ IconManager::~IconManager() {
   STLDeleteValues(&icon_cache_);
 }
 
-gfx::Image* IconManager::LookupIcon(const FilePath& file_name,
+gfx::Image* IconManager::LookupIconFromFilepath(const FilePath& file_name,
                                     IconLoader::IconSize size) {
-  IconGroupID group = GetGroupIDFromFilepath(file_name);
-  IconMap::iterator it = icon_cache_.find(CacheKey(group, size));
+  IconMap::iterator it = icon_cache_.find(CacheKey(file_name, size));
   if (it != icon_cache_.end())
     return it->second;
 
@@ -53,9 +52,7 @@ CancelableTaskTracker::TaskId IconManager::LoadIcon(
     IconLoader::IconSize size,
     const IconRequestCallback& callback,
     CancelableTaskTracker* tracker) {
-  IconGroupID group = GetGroupIDFromFilepath(file_name);
-
-  IconLoader* loader = new IconLoader(group, size, this);
+  IconLoader* loader = new IconLoader(file_name, size, this);
   loader->AddRef();
   loader->Start();
 
@@ -64,7 +61,7 @@ CancelableTaskTracker::TaskId IconManager::LoadIcon(
   IconRequestCallback callback_runner = base::Bind(
       &RunCallbackIfNotCanceled, is_canceled, callback);
 
-  ClientRequest client_request = { callback_runner, group, size };
+  ClientRequest client_request = { callback_runner, file_name, size };
   requests_[loader] = client_request;
   return id;
 }
@@ -87,7 +84,7 @@ bool IconManager::OnImageLoaded(IconLoader* loader, gfx::Image* result) {
 
   // Cache the bitmap. Watch out: |result| or the cached bitmap may be NULL to
   // indicate a current or past failure.
-  CacheKey key(client_request.group, client_request.size);
+  CacheKey key(client_request.file_path, client_request.size);
   IconMap::iterator it = icon_cache_.find(key);
   if (it != icon_cache_.end() && result && it->second) {
     it->second->SwapRepresentations(result);
@@ -104,14 +101,14 @@ bool IconManager::OnImageLoaded(IconLoader* loader, gfx::Image* result) {
   return true;  // Indicates we took ownership of result.
 }
 
-IconManager::CacheKey::CacheKey(const IconGroupID& group,
+IconManager::CacheKey::CacheKey(const FilePath& file_name,
                                 IconLoader::IconSize size)
-    : group(group),
+    : file_name(file_name),
       size(size) {
 }
 
 bool IconManager::CacheKey::operator<(const CacheKey &other) const {
-  if (group != other.group)
-    return group < other.group;
+  if (file_name != other.file_name)
+    return file_name < other.file_name;
   return size < other.size;
 }