Clean up 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 262bc54a12e8aea0c863edebbf6809fb332df9e4..79a17e3e6c17040cbc882fdfe88260676b178ba7 100644
--- a/chrome/browser/icon_loader.cc
+++ b/chrome/browser/icon_loader.cc
@@ -10,12 +10,17 @@
 
 using content::BrowserThread;
 
+/*static*/

[sky, 2016/12/16 23:27:27]

style for these is
// static

[Avi (use Gerrit), 2016/12/17 02:28:53]

Done.

+IconLoader* IconLoader::Create(const base::FilePath& file_path,
+                               IconSize size,
+                               IconLoadedCallback callback) {
+  return new IconLoader(file_path, size, callback);
+}
+
 IconLoader::IconLoader(const base::FilePath& file_path,
                        IconSize size,
-                       Delegate* delegate)
-    : file_path_(file_path),
-      icon_size_(size),
-      delegate_(delegate) {}
+                       IconLoadedCallback callback)
+    : file_path_(file_path), icon_size_(size), callback_(callback) {}
 
 IconLoader::~IconLoader() {
 }
@@ -23,9 +28,10 @@ IconLoader::~IconLoader() {
 void IconLoader::Start() {

[sky, 2016/12/16 23:27:27]

move above constructor (to match declaration order).

[Avi (use Gerrit), 2016/12/17 02:28:53]

Done.

   target_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 
-  BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&IconLoader::ReadGroup, this),
-      base::Bind(&IconLoader::OnReadGroup, this));
+  BrowserThread::PostTaskAndReply(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&IconLoader::ReadGroup, base::Unretained(this)),
+      base::Bind(&IconLoader::OnReadGroup, base::Unretained(this)));
 }
 
 void IconLoader::ReadGroup() {
@@ -33,10 +39,7 @@ void IconLoader::ReadGroup() {
 }
 
 void IconLoader::OnReadGroup() {
-  BrowserThread::PostTask(ReadIconThreadID(), FROM_HERE,
-                          base::Bind(&IconLoader::ReadIcon, this));
-}
-
-void IconLoader::NotifyDelegate() {
-  delegate_->OnImageLoaded(this, std::move(image_), group_);
+  BrowserThread::PostTask(
+      ReadIconThreadID(), FROM_HERE,
+      base::Bind(&IconLoader::ReadIcon, base::Unretained(this)));
 }