Update Content Settings Bubbles

chrome/browser/content_setting_bubble_model_unittest.cc

 // Copyright (c) 2010 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/content_setting_bubble_model.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 12 matching lines @@
   }
 
   void CheckGeolocationBubble(size_t expected_domains,
                               bool expect_clear_link,
                               bool expect_reload_hint) {
     scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
         ContentSettingBubbleModel::CreateContentSettingBubbleModel(
            contents(), profile_.get(), CONTENT_SETTINGS_TYPE_GEOLOCATION));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
+    EXPECT_EQ(std::string(), bubble_content.title);

[Peter Kasting, 2010/12/09 17:56:34]

Nit: Use EXPECT_TRUE(bubble_content.title.empty()); here and in all the similar
places below (boo to whomever wrote this unit test)

     EXPECT_EQ(0U, bubble_content.radio_group.radio_items.size());

[Peter Kasting, 2010/12/09 17:56:34]

Nit: These can both be changed to EXPECT_TRUE(xxx.empty()) also

     EXPECT_EQ(0U, bubble_content.popup_items.size());
-    // The reload hint is currently implemented as a tacked on domain title, so
-    // account for this.
-    if (expect_reload_hint)
-      ++expected_domains;
     EXPECT_EQ(expected_domains, bubble_content.domain_lists.size());
-    if (expect_clear_link)
-      EXPECT_NE(std::string(), bubble_content.clear_link);
+    if (expect_clear_link || expect_reload_hint) {

[Peter Kasting, 2010/12/09 17:56:34]

Nit: This conditional can just become:

  EXPECT_NE(expect_clear_link || expect_reload_hint,
            bubble_content.custom_link.empty());

+      EXPECT_NE(std::string(), bubble_content.custom_link);
     else
-      EXPECT_EQ(std::string(), bubble_content.clear_link);
+      EXPECT_EQ(std::string(), bubble_content.custom_link);
+    EXPECT_EQ(expect_clear_link, bubble_content.custom_link_enabled);
     EXPECT_NE(std::string(), bubble_content.manage_link);
-    EXPECT_EQ(std::string(), bubble_content.info_link);
-    EXPECT_EQ(std::string(), bubble_content.title);
-    EXPECT_EQ(std::string(), bubble_content.load_plugins_link_title);
   }
 
   BrowserThread ui_thread_;
 };
 
 TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
   TabSpecificContentSettings* content_settings =
       contents()->GetTabSpecificContentSettings();
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
                                      std::string());
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          contents(), profile_.get(), CONTENT_SETTINGS_TYPE_IMAGES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
+  EXPECT_NE(std::string(), bubble_content.title);
   EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
   EXPECT_EQ(0, bubble_content.radio_group.default_item);
+  EXPECT_EQ(std::string(), bubble_content.custom_link);
+  EXPECT_FALSE(bubble_content.custom_link_enabled);
   EXPECT_NE(std::string(), bubble_content.manage_link);
-  EXPECT_EQ(std::string(), bubble_content.info_link);
-  EXPECT_NE(std::string(), bubble_content.title);
-  EXPECT_EQ(std::string(), bubble_content.load_plugins_link_title);
 }
 
 TEST_F(ContentSettingBubbleModelTest, Cookies) {
   TabSpecificContentSettings* content_settings =
       contents()->GetTabSpecificContentSettings();
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES,
                                      std::string());
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          contents(), profile_.get(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
+  EXPECT_NE(std::string(), bubble_content.title);
   EXPECT_EQ(0U, bubble_content.radio_group.radio_items.size());
+  EXPECT_NE(std::string(), bubble_content.custom_link);
+  EXPECT_TRUE(bubble_content.custom_link_enabled);
   EXPECT_NE(std::string(), bubble_content.manage_link);
-  EXPECT_NE(std::string(), bubble_content.info_link);
-  EXPECT_NE(std::string(), bubble_content.title);
-  EXPECT_EQ(std::string(), bubble_content.load_plugins_link_title);
 }
 
 TEST_F(ContentSettingBubbleModelTest, Plugins) {
   TabSpecificContentSettings* content_settings =
       contents()->GetTabSpecificContentSettings();
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS,
                                      std::string());
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          contents(), profile_.get(), CONTENT_SETTINGS_TYPE_PLUGINS));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
+  EXPECT_NE(std::string(), bubble_content.title);
   EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
+  EXPECT_EQ(std::string(), bubble_content.custom_link);
+  EXPECT_FALSE(bubble_content.custom_link_enabled);
   EXPECT_NE(std::string(), bubble_content.manage_link);
-  EXPECT_EQ(std::string(), bubble_content.info_link);
-  EXPECT_NE(std::string(), bubble_content.title);
-  EXPECT_NE(std::string(), bubble_content.load_plugins_link_title);
 }
 
 TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
   cmd->AppendSwitch(switches::kEnableClickToPlay);
 
   HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
   std::string fooPlugin = "foo";
@@ skipping 70 matching lines @@
   CheckGeolocationBubble(1, false, false);
 
   // Second frame denied, but not stored in the content map: requires reload.
   content_settings->OnGeolocationPermissionSet(frame2_url, false);
   CheckGeolocationBubble(2, false, true);
 
   // Change the default to block: offer a clear link for the persisted frame 1.
   setting_map->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
   CheckGeolocationBubble(2, true, false);
 }