Factoring out of FaviconLoader

chrome/browser/ui/intents/web_intent_picker_model_unittest.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 "base/utf_string_conversions.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
@@ skipping 116 matching lines @@
 TEST_F(WebIntentPickerModelTest, GetInstalledServiceWithURL) {
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
 
   model_.AddInstalledService(kTitle1, kUrl1, kWindowDisposition);
   model_.AddInstalledService(kTitle2, kUrl2, kWindowDisposition);
 
   EXPECT_EQ(kTitle2, model_.GetInstalledServiceWithURL(kUrl2)->title);
   EXPECT_EQ(NULL, model_.GetInstalledServiceWithURL(kUrl3));
 }
 
-TEST_F(WebIntentPickerModelTest, UpdateFaviconAt) {
+TEST_F(WebIntentPickerModelTest, UpdateFaviconForServiceWithURL) {
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
   EXPECT_CALL(observer_, OnFaviconChanged(&model_, 1U)).Times(1);
 
   model_.AddInstalledService(kTitle1, kUrl1, kWindowDisposition);
   model_.AddInstalledService(kTitle2, kUrl2, kWindowDisposition);
   gfx::Image image(gfx::test::CreateImage());
-  model_.UpdateFaviconAt(1U, image);
+  model_.UpdateFaviconForServiceWithURL(kUrl2, image);
 
   EXPECT_FALSE(gfx::test::IsEqual(
       image, model_.GetInstalledServiceAt(0).favicon));
   EXPECT_TRUE(gfx::test::IsEqual(
       image, model_.GetInstalledServiceAt(1).favicon));
 }
 
 TEST_F(WebIntentPickerModelTest, AddSuggestedExtensions) {
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(1);
 
@@ skipping 72 matching lines @@
   // Default status is that "waiting for suggestions".
   EXPECT_TRUE(model_.IsWaitingForSuggestions());
 
   // "waiting" status can be toggled manually.
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
   model_.SetWaitingForSuggestions(false);
   EXPECT_FALSE(model_.IsWaitingForSuggestions());
   model_.SetWaitingForSuggestions(true);
   EXPECT_TRUE(model_.IsWaitingForSuggestions());
 }