Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

chrome/browser/ui/content_settings/content_setting_bubble_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/auto_reset.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
@@ skipping 38 matching lines @@
     EXPECT_NE(expect_clear_link || expect_reload_hint,
               bubble_content.custom_link.empty());
     EXPECT_EQ(expect_clear_link, bubble_content.custom_link_enabled);
     EXPECT_FALSE(bubble_content.manage_link.empty());
   }
 };
 
 TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
-                                     std::string());
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          NULL, web_contents(), profile(),
          CONTENT_SETTINGS_TYPE_IMAGES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_FALSE(bubble_content.title.empty());
   EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
   EXPECT_EQ(0, bubble_content.radio_group.default_item);
   EXPECT_TRUE(bubble_content.custom_link.empty());
   EXPECT_FALSE(bubble_content.manage_link.empty());
 }
 
 TEST_F(ContentSettingBubbleModelTest, Cookies) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES,
-                                     std::string());
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES);
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   std::string title = bubble_content.title;
   EXPECT_FALSE(title.empty());
   ASSERT_EQ(2U, bubble_content.radio_group.radio_items.size());
   std::string radio1 = bubble_content.radio_group.radio_items[0];
@@ skipping 352 matching lines @@
   EXPECT_EQ(new_bubble_content.radio_group.radio_items[1],
             l10n_util::GetStringUTF8(
                 IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK));
   EXPECT_EQ(0, new_bubble_content.radio_group.default_item);
   EXPECT_EQ(2U, new_bubble_content.media_menus.size());
 }
 
 TEST_F(ContentSettingBubbleModelTest, Plugins) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                     std::string());
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          NULL, web_contents(), profile(),
          CONTENT_SETTINGS_TYPE_PLUGINS));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_FALSE(bubble_content.title.empty());
   EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
   EXPECT_FALSE(bubble_content.custom_link.empty());
   EXPECT_TRUE(bubble_content.custom_link_enabled);
   EXPECT_FALSE(bubble_content.manage_link.empty());
 }
 
-TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
-  base::AutoReset<CommandLine> auto_reset(cmd, *cmd);
-  cmd->AppendSwitch(switches::kEnableResourceContentSettings);
-
-  HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();
-  std::string fooPlugin = "foo";
-  std::string barPlugin = "bar";
-
-  // Navigating to some sample url prevents the GetURL method from returning an
-  // invalid empty URL.
-  WebContentsTester::For(web_contents())->
-      NavigateAndCommit(GURL("http://www.example.com"));
-  GURL url = web_contents()->GetURL();
-  map->AddExceptionForURL(url,
-                          url,
-                          CONTENT_SETTINGS_TYPE_PLUGINS,
-                          fooPlugin,
-                          CONTENT_SETTING_ALLOW);
-  map->AddExceptionForURL(url,
-                          url,
-                          CONTENT_SETTINGS_TYPE_PLUGINS,
-                          barPlugin,
-                          CONTENT_SETTING_ASK);
-
-  TabSpecificContentSettings* content_settings =
-      TabSpecificContentSettings::FromWebContents(web_contents());
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                     fooPlugin);
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                     barPlugin);
-
-  scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(),
-          CONTENT_SETTINGS_TYPE_PLUGINS));
-  const ContentSettingBubbleModel::BubbleContent& bubble_content =
-      content_setting_bubble_model->bubble_content();
-  EXPECT_EQ(2U, bubble_content.radio_group.radio_items.size());
-  EXPECT_EQ(1, bubble_content.radio_group.default_item);
-
-  content_setting_bubble_model->OnRadioClicked(0);
-  // Nothing should have changed.
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url,
-                                   url,
-                                   CONTENT_SETTINGS_TYPE_PLUGINS,
-                                   fooPlugin));
-  EXPECT_EQ(CONTENT_SETTING_ASK,
-            map->GetContentSetting(url,
-                                   url,
-                                   CONTENT_SETTINGS_TYPE_PLUGINS,
-                                   barPlugin));
-
-  content_setting_bubble_model.reset();
-  // Both plug-ins should be click-to-play now.
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url,
-                                   url,
-                                   CONTENT_SETTINGS_TYPE_PLUGINS,
-                                   fooPlugin));
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map->GetContentSetting(url,
-                                   url,
-                                   CONTENT_SETTINGS_TYPE_PLUGINS,
-                                   barPlugin));
-}
-
 TEST_F(ContentSettingBubbleModelTest, PepperBroker) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
-                                     std::string());
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_PPAPI_BROKER);
 
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          NULL, web_contents(), profile(),
          CONTENT_SETTINGS_TYPE_PPAPI_BROKER));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
 
   std::string title = bubble_content.title;
   EXPECT_FALSE(title.empty());
@@ skipping 57 matching lines @@
   // Change the default to block: offer a clear link for the persisted frame 1.
   profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_BLOCK);
   CheckGeolocationBubble(2, true, false);
 }
 
 TEST_F(ContentSettingBubbleModelTest, FileURL) {
   std::string file_url("file:///tmp/test.html");
   NavigateAndCommit(GURL(file_url));
   TabSpecificContentSettings::FromWebContents(web_contents())->OnContentBlocked(
-      CONTENT_SETTINGS_TYPE_IMAGES, std::string());
+      CONTENT_SETTINGS_TYPE_IMAGES);
   scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           NULL, web_contents(), profile(),
           CONTENT_SETTINGS_TYPE_IMAGES));
   std::string title =
       content_setting_bubble_model->bubble_content().radio_group.radio_items[0];
   ASSERT_NE(std::string::npos, title.find(file_url));
 }
 
 TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {
@@ skipping 106 matching lines @@
     ProtocolHandler handler = registry.GetHandlerFor("mailto");
     ASSERT_FALSE(handler.IsEmpty());
     EXPECT_EQ(ASCIIToUTF16("Handler"), handler.title());
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               content_settings->pending_protocol_handler_setting());
     EXPECT_FALSE(registry.IsIgnored(test_handler));
   }
 
   registry.Shutdown();
 }