Refactor TaskManager's favicon retrieval approach

chrome/browser/task_management/providers/web_contents/web_contents_task_provider.cc

 // Copyright 2015 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/task_management/providers/web_contents/web_contents_task_provider.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/task_management/providers/web_contents/subframe_task.h"
 #include "chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h"
@@ skipping 36 matching lines @@
   // content::WebContentsObserver:
   void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
   void RenderFrameHostChanged(RenderFrameHost* old_host,
                               RenderFrameHost* new_host) override;
   void RenderViewReady() override;
   void WebContentsDestroyed() override;
   void RenderProcessGone(base::TerminationStatus status) override;
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  void DocumentOnLoadCompletedInMainFrame() override;
   void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
-  void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& candidates) override;
 
  private:
   // Defines a callback for WebContents::ForEachFrame() to create a
   // corresponding task for the given |render_frame_host| and notifying the
   // provider's observer of the new task.
   void CreateTaskForFrame(RenderFrameHost* render_frame_host);
 
   // Clears the task that corresponds to the given |render_frame_host| and
   // notifies the provider's observer of the tasks removal.
   void ClearTaskForFrame(RenderFrameHost* render_frame_host);
@@ skipping 96 matching lines @@
   auto itr = tasks_by_frames_.find(web_contents()->GetMainFrame());
   if (itr == tasks_by_frames_.end()) {
     // TODO(afakhry): Validate whether this actually happens in practice.
     NOTREACHED();
     return;
   }
 
   itr->second->UpdateTitle();
 }
 
-void WebContentsEntry::DocumentOnLoadCompletedInMainFrame() {
-  // Note: Requesting the task to update its favicon, in any earlier occurring
-  // event than this one, may not work properly. We also need to listen to
-  // WebContentsObserver::DidUpdateFaviconURL().
-  auto itr = tasks_by_frames_.find(web_contents()->GetMainFrame());
-  if (itr == tasks_by_frames_.end()) {
-    // TODO(afakhry): Validate whether this actually happens in practice.
-    NOTREACHED();
-    return;
-  }
-
-  itr->second->UpdateFavicon();
-}
-
 void WebContentsEntry::TitleWasSet(content::NavigationEntry* entry,
                                    bool explicit_set) {
   auto itr = tasks_by_frames_.find(web_contents()->GetMainFrame());
   if (itr == tasks_by_frames_.end()) {
     // TODO(afakhry): Validate whether this actually happens in practice.
     NOTREACHED();
     return;
   }
 
   itr->second->UpdateTitle();
 }
 
-void WebContentsEntry::DidUpdateFaviconURL(
-    const std::vector<content::FaviconURL>& candidates) {
-  auto itr = tasks_by_frames_.find(web_contents()->GetMainFrame());
-  if (itr == tasks_by_frames_.end()) {
-    // TODO(afakhry): Validate whether this actually happens in practice.
-    NOTREACHED();
-    return;
-  }
-
-  itr->second->UpdateFavicon();
-}
-
 void WebContentsEntry::CreateTaskForFrame(RenderFrameHost* render_frame_host) {
   DCHECK_EQ(0U, tasks_by_frames_.count(render_frame_host));
 
   content::SiteInstance* site_instance = render_frame_host->GetSiteInstance();
   if (!site_instance->GetProcess()->HasConnection())
     return;
 
   bool site_instance_exists =
       frames_by_site_instance_.count(site_instance) != 0U;
   bool is_main_frame = (render_frame_host == web_contents()->GetMainFrame());
@@ skipping 173 matching lines @@
 
   WebContentsEntry* entry = itr->second;
   entries_map_.erase(itr);
 
   // The entry we're about to delete is our caller, however its' still fine to
   // delete it.
   delete entry;
 }
 
 }  // namespace task_management