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

chrome/browser/icon_loader.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/icon_loader.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "chrome/browser/icon_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(TOOLKIT_GTK)
 #include "base/nix/mime_util_xdg.h"
 #endif
 
 using content::BrowserThread;
 
-IconLoader::IconLoader(const IconGroupID& group, IconSize size,
+IconLoader::IconLoader(const base::FilePath& file_path, IconSize size,
                        Delegate* delegate)
     : target_message_loop_(NULL),
-      group_(group),
+      file_path_(file_path),
       icon_size_(size),
       image_(NULL),
       delegate_(delegate) {
 }
 
 IconLoader::~IconLoader() {
 }
 
 void IconLoader::Start() {
   target_message_loop_ = base::MessageLoopProxy::current();
 
 #if defined(TOOLKIT_GTK)
   // This call must happen on the UI thread before we can start loading icons.
   base::nix::DetectGtkTheme();
 #endif
 
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&IconLoader::ReadIcon, this));
+  IconGroupID* group = new IconGroupID();

[Robert Sesek, 2013/02/12 16:49:25]

Who owns this? When is it deleted? Can't this just be a member?

[shatch, 2013/02/13 16:14:52]

Done.

+
+  BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
+      base::Bind(&IconLoader::ReadGroup, this, base::Unretained(group)),
+      base::Bind(&IconLoader::OnReadGroup, this, base::Owned(group)));
 }
 
-void IconLoader::NotifyDelegate() {
+void IconLoader::ReadGroup(IconGroupID* group) {
+  *group = IconManager::ReadGroupIDFromFilepath(file_path_);
+}
+
+void IconLoader::OnReadGroup(const IconGroupID* group) {
+  if (!delegate_->OnGroupLoaded(this, *group)) {
+    IconGroupID g = *group;
+    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+        base::Bind(&IconLoader::ReadIcon, this, g));
+  }
+}
+
+void IconLoader::NotifyDelegate(const IconGroupID& group) {
   // If the delegate takes ownership of the Image, release it from the scoped
   // pointer.
-  if (delegate_->OnImageLoaded(this, image_.get()))
+  if (delegate_->OnImageLoaded(this, image_.get(), group))
     ignore_result(image_.release());  // Can't ignore return value.
 }