commit 381f719fd68a0b32d41ad0605528aab75d4e9380
author avi <avi@chromium.org> Fri Dec 16 00:05:02 2016
committer Commit bot <commit-bot@chromium.org> Fri Dec 16 00:07:34 2016
tree 6ae9a6bd628a1b2a75b295c08e87fc1f6c16a0ee
parent a0ac8380d62de7427ec5e0bc3d7e871618497876

Clean up the IconLoader.

The text was weirdly vague, trying to be cross-platform but not succeeding, there were odd conditions that could cause leaks, and there was about twice the complexity built in than it actually ended up using.

BUG=555865

Review-Url: https://codereview.chromium.org/2440273002
Cr-Commit-Position: refs/heads/master@{#438961}

chrome/browser/icon_loader.cc

diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc
index 979ee57..262bc54 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -13,8 +13,7 @@
 IconLoader::IconLoader(const base::FilePath& file_path,
                        IconSize size,
                        Delegate* delegate)
-    : target_task_runner_(NULL),
-      file_path_(file_path),
+    : file_path_(file_path),
       icon_size_(size),
       delegate_(delegate) {}
 
@@ -30,20 +29,14 @@
 }
 
 void IconLoader::ReadGroup() {
-  group_ = ReadGroupIDFromFilepath(file_path_);
+  group_ = GroupForFilepath(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_);
 }