Factoring out of FaviconLoader

chrome/browser/ui/intents/web_intent_picker_model.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/ui/intents/web_intent_picker_model.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 73 matching lines @@
     if (service->url == url)
       return service;
   }
   return NULL;
 }
 
 size_t WebIntentPickerModel::GetInstalledServiceCount() const {
   return installed_services_.size();
 }
 
-void WebIntentPickerModel::UpdateFaviconAt(size_t index,
-                                           const gfx::Image& image) {
-  DCHECK_LT(index, installed_services_.size());
-  installed_services_[index]->favicon = image;
-  if (observer_)
-    observer_->OnFaviconChanged(this, index);
+void WebIntentPickerModel::UpdateFaviconForServiceWithURL(
+    const GURL& url, const gfx::Image& image) {
+  for (size_t i = 0; i < installed_services_.size(); ++i) {
+    InstalledService* service = installed_services_[i];
+    if (service->url == url) {
+      service->favicon = image;
+      if (observer_)
+        observer_->OnFaviconChanged(this, i);
+      return;
+    }
+  }
+  NOTREACHED();  // Calling this with an invalid URL is not allowed.
 }
 
 void WebIntentPickerModel::AddSuggestedExtensions(
     const std::vector<SuggestedExtension>& suggestions) {
   suggested_extensions_.insert(suggested_extensions_.end(),
                                suggestions.begin(),
                                suggestions.end());
   if (observer_)
     observer_->OnModelChanged(this);
 }
@@ skipping 149 matching lines @@
     double average_rating)
     : title(title),
       id(id),
       average_rating(average_rating),
       icon(ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_DEFAULT_FAVICON)) {
 }
 
 WebIntentPickerModel::SuggestedExtension::~SuggestedExtension() {
 }