[Web Intents] WebIntentsPickerController will now fetch icon for suggested extensions.

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 15 matching lines @@
 const WebIntentPickerModel::Disposition kInlineDisposition(
     WebIntentPickerModel::DISPOSITION_INLINE);
 
 }
 
 class WebIntentPickerModelObserverMock : public WebIntentPickerModelObserver {
  public:
   MOCK_METHOD1(OnModelChanged, void(WebIntentPickerModel* model));
   MOCK_METHOD2(OnFaviconChanged,
                void(WebIntentPickerModel* model, size_t index));
+  MOCK_METHOD2(OnExtensionIconChanged,
+               void(WebIntentPickerModel* model, const string16& extension_id));
   MOCK_METHOD1(OnInlineDisposition, void(WebIntentPickerModel* model));
 };
 
 class WebIntentPickerModelTest : public testing::Test {
  public:
   WebIntentPickerModelTest() {}
 
   virtual void SetUp() {
     testing::Test::SetUp();
     model_.set_observer(&observer_);
@@ skipping 82 matching lines @@
 
   EXPECT_EQ(3U, model_.GetSuggestedExtensionCount());
 
   model_.RemoveSuggestedExtensionAt(1);
 
   EXPECT_EQ(2U, model_.GetSuggestedExtensionCount());
   EXPECT_EQ(kId1, model_.GetSuggestedExtensionAt(0).id);
   EXPECT_EQ(kId3, model_.GetSuggestedExtensionAt(1).id);
 }
 
+TEST_F(WebIntentPickerModelTest, SetSuggestedExtensionIconWithId) {
+  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
+  EXPECT_CALL(observer_, OnExtensionIconChanged(&model_, kId2)).Times(1);
+
+  model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
+  model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
+
+  gfx::Image image(gfx::test::CreateImage());
+  model_.SetSuggestedExtensionIconWithId(kId2, image);
+
+  EXPECT_FALSE(gfx::test::IsEqual(
+      image, model_.GetSuggestedExtensionAt(0).icon));
+  EXPECT_TRUE(gfx::test::IsEqual(
+      image, model_.GetSuggestedExtensionAt(1).icon));
+}
+
 TEST_F(WebIntentPickerModelTest, SetInlineDisposition) {
   EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(3);
   EXPECT_CALL(observer_, OnInlineDisposition(&model_)).Times(1);
 
   EXPECT_FALSE(model_.IsInlineDisposition());
   EXPECT_EQ(std::string::npos, model_.inline_disposition_index());
 
   model_.AddInstalledService(kTitle1, kUrl1, kWindowDisposition);
   model_.AddInstalledService(kTitle2, kUrl2, kInlineDisposition);
   model_.SetInlineDisposition(1);
 
   EXPECT_TRUE(model_.IsInlineDisposition());
   EXPECT_EQ(1U, model_.inline_disposition_index());
 
   model_.Clear();
 
   EXPECT_FALSE(model_.IsInlineDisposition());
   EXPECT_EQ(std::string::npos, model_.inline_disposition_index());
 }