Change picker model API to allow less notification messages

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 29 matching lines @@
   MOCK_METHOD2(OnFaviconChanged,
                void(WebIntentPickerModel* model, size_t index));
   MOCK_METHOD2(OnExtensionIconChanged,
                void(WebIntentPickerModel* model, const string16& extension_id));
   MOCK_METHOD2(OnInlineDisposition,
                void(const string16& title, const GURL& url));
 };
 
 class WebIntentPickerModelTest : public testing::Test {
  public:
+  typedef WebIntentPickerModel::SuggestedExtension SuggestedExtension;
   WebIntentPickerModelTest() {}
 
   virtual void SetUp() {
     testing::Test::SetUp();
     model_.set_observer(&observer_);
   }
 
   WebIntentPickerModel model_;
   WebIntentPickerModelObserverMock observer_;
 };
@@ skipping 80 matching lines @@
   model_.AddInstalledService(kTitle2, kUrl2, kWindowDisposition);
   gfx::Image image(gfx::test::CreateImage());
   model_.UpdateFaviconAt(1U, image);
 
   EXPECT_FALSE(gfx::test::IsEqual(
       image, model_.GetInstalledServiceAt(0).favicon));
   EXPECT_TRUE(gfx::test::IsEqual(
       image, model_.GetInstalledServiceAt(1).favicon));
 }
 
-TEST_F(WebIntentPickerModelTest, AddSuggestedExtension) {
-  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(2);
+TEST_F(WebIntentPickerModelTest, AddSuggestedExtensions) {
+  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(1);
 
   EXPECT_EQ(0U, model_.GetSuggestedExtensionCount());
 
-  model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
-  model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
+  std::vector<WebIntentPickerModel::SuggestedExtension> suggestions;
+  suggestions.push_back(
+      WebIntentPickerModel::SuggestedExtension(kTitle1, kId1, 3.0));
+  suggestions.push_back(
+      WebIntentPickerModel::SuggestedExtension(kTitle2, kId2, 4.0));
+  model_.AddSuggestedExtensions(suggestions);
 
   EXPECT_EQ(2U, model_.GetSuggestedExtensionCount());
   EXPECT_EQ(kId1, model_.GetSuggestedExtensionAt(0).id);
   EXPECT_EQ(kId2, model_.GetSuggestedExtensionAt(1).id);
 
   EXPECT_EQ(string16(), model_.GetSuggestionsLinkText());
 }
 
 TEST_F(WebIntentPickerModelTest, MaxSuggestedExtensions) {
-  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(6);
+  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(1);
 
-  model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
-  model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
-  model_.AddSuggestedExtension(kTitle3, kId3, 4.4);
-  model_.AddSuggestedExtension(kTitle4, kId4, 4.5);
-  model_.AddSuggestedExtension(kTitle5, kId5, 4.6);
-  model_.AddSuggestedExtension(kTitle6, kId6, 4.7);
+  std::vector<SuggestedExtension> suggestions;
+  suggestions.push_back(SuggestedExtension(kTitle1, kId1, 3.0));
+  suggestions.push_back(SuggestedExtension(kTitle2, kId2, 4.3));
+  suggestions.push_back(SuggestedExtension(kTitle3, kId3, 4.4));
+  suggestions.push_back(SuggestedExtension(kTitle4, kId4, 4.5));
+  suggestions.push_back(SuggestedExtension(kTitle5, kId5, 4.6));
+  suggestions.push_back(SuggestedExtension(kTitle6, kId6, 4.7));
+  model_.AddSuggestedExtensions(suggestions);
 
   // Max to show currently set to 5.
   EXPECT_EQ(5U, model_.GetSuggestedExtensionCount());
   EXPECT_NE(string16(), model_.GetSuggestionsLinkText());
 }
 
-TEST_F(WebIntentPickerModelTest, RemoveSuggestedExtensionAt) {
-  EXPECT_CALL(observer_, OnModelChanged(&model_)).Times(4);
-
-  model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
-  model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
-  model_.AddSuggestedExtension(kTitle3, kId3, 1.6);
-
-  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_, OnModelChanged(&model_)).Times(1);
   EXPECT_CALL(observer_, OnExtensionIconChanged(&model_, kId2)).Times(1);
 
-  model_.AddSuggestedExtension(kTitle1, kId1, 3.0);
-  model_.AddSuggestedExtension(kTitle2, kId2, 4.3);
+  std::vector<SuggestedExtension> suggestions;
+  suggestions.push_back(SuggestedExtension(kTitle1, kId1, 3.0));
+  suggestions.push_back(SuggestedExtension(kTitle2, kId2, 4.3));
+  model_.AddSuggestedExtensions(suggestions);
 
   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(kTitle2, testing::_)).Times(1);
 
   EXPECT_FALSE(model_.IsInlineDisposition());
   EXPECT_EQ(GURL::EmptyGURL(), model_.inline_disposition_url());
 
   model_.AddInstalledService(kTitle1, kUrl1, kWindowDisposition);
   model_.AddInstalledService(kTitle2, kUrl2, kInlineDisposition);
   model_.SetInlineDisposition(kUrl2);
 
   EXPECT_TRUE(model_.IsInlineDisposition());
   EXPECT_EQ(kUrl2, model_.inline_disposition_url());
 
   model_.Clear();
 
   EXPECT_FALSE(model_.IsInlineDisposition());
   EXPECT_EQ(GURL::EmptyGURL(), model_.inline_disposition_url());
 }