Simplify content settings bubble model "radio groups" to a single radio group.

There's no longer a use case for multiple radio groups (was originally planned for Geolocation), simplify the model and its views.

BUG=39073
TEST=content_setting_bubble_model_unittest

Review URL: http://codereview.chromium.org/1575022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44070 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc
index d6555014..dbcd2b0 100644
--- a/chrome/browser/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/content_setting_bubble_model_unittest.cc
@@ -24,8 +24,8 @@ class ContentSettingBubbleModelTest : public RenderViewHostTestHarness {
            contents(), profile_.get(), CONTENT_SETTINGS_TYPE_GEOLOCATION));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
+    EXPECT_EQ(0U, bubble_content.radio_group.radio_items.size());
     EXPECT_EQ(0U, bubble_content.popup_items.size());
-    EXPECT_EQ(0U, bubble_content.radio_groups.size());
     // The reload hint is currently implemented as a tacked on domain title, so
     // account for this.
     if (expect_reload_hint)
@@ -51,9 +51,8 @@ TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
          contents(), profile_.get(), CONTENT_SETTINGS_TYPE_IMAGES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
-  EXPECT_EQ(1U, bubble_content.radio_groups.size());
-  EXPECT_EQ(2U, bubble_content.radio_groups[0].radio_items.size());
-  EXPECT_EQ(0, bubble_content.radio_groups[0].default_item);
+  EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
+  EXPECT_EQ(0, bubble_content.radio_group.default_item);
   EXPECT_NE(std::string(), bubble_content.manage_link);
   EXPECT_NE(std::string(), bubble_content.title);
 }
@@ -67,7 +66,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
          contents(), profile_.get(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
-  EXPECT_EQ(0U, bubble_content.radio_groups.size());
+  EXPECT_EQ(0U, bubble_content.radio_group.radio_items.size());
   EXPECT_NE(std::string(), bubble_content.manage_link);
   EXPECT_NE(std::string(), bubble_content.title);
 }