Clean up the IconLoader.

chrome/browser/icon_loader.cc

Index: chrome/browser/icon_loader.cc
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc
index 979ee5772c15fc40f2ee2e653a7c54197b5b0aa4..b0cdf0b52b8b91bf09842db4c3b38c6c47598147 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -10,11 +10,11 @@
 
 using content::BrowserThread;
 
-IconLoader::IconLoader(const base::FilePath& file_path,
+IconLoader::IconLoader(const IconGroup& group,
                        IconSize size,
                        Delegate* delegate)
-    : target_task_runner_(NULL),
-      file_path_(file_path),
+    : target_task_runner_(nullptr),
+      group_(group),
       icon_size_(size),
       delegate_(delegate) {}
 
@@ -24,26 +24,10 @@ IconLoader::~IconLoader() {
 void IconLoader::Start() {
   target_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 
-  BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&IconLoader::ReadGroup, this),
-      base::Bind(&IconLoader::OnReadGroup, this));
-}
-
-void IconLoader::ReadGroup() {
-  group_ = ReadGroupIDFromFilepath(file_path_);
-}
-
-void IconLoader::OnReadGroup() {
-  if (IsIconMutableFromFilepath(file_path_) ||
-      !delegate_->OnGroupLoaded(this, group_)) {
-    BrowserThread::PostTask(ReadIconThreadID(), FROM_HERE,
-        base::Bind(&IconLoader::ReadIcon, this));
-  }
+  BrowserThread::PostTask(ReadIconThreadID(), FROM_HERE,
+                          base::Bind(&IconLoader::ReadIcon, this));
 }
 
 void IconLoader::NotifyDelegate() {
-  // If the delegate takes ownership of the Image, release it from the scoped
-  // pointer.
-  if (delegate_->OnImageLoaded(this, image_.get(), group_))
-    ignore_result(image_.release());  // Can't ignore return value.
+  delegate_->OnImageLoaded(this, std::move(image_), group_);
 }