Store blocked cookies in the tab contents.

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 "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
@@ skipping 25 matching lines @@
     else
       EXPECT_EQ(std::string(), bubble_content.clear_link);
     EXPECT_NE(std::string(), bubble_content.manage_link);
     EXPECT_EQ(std::string(), bubble_content.title);
   }
 
   ChromeThread ui_thread_;
 };
 
 TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
-  RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
-      contents();
-  render_view_host_delegate->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
+  TabSpecificContentSettings* content_settings =
+      contents()->GetTabSpecificContentSettings();
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
 
   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_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);
 }
 
 TEST_F(ContentSettingBubbleModelTest, Cookies) {
-  RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
-      contents();
-  render_view_host_delegate->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES);
+  TabSpecificContentSettings* content_settings =
+      contents()->GetTabSpecificContentSettings();
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES);
 
   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_EQ(0U, bubble_content.radio_group.radio_items.size());
   EXPECT_NE(std::string(), bubble_content.manage_link);
   EXPECT_NE(std::string(), bubble_content.title);
 }
 
 TEST_F(ContentSettingBubbleModelTest, Geolocation) {
   const GURL page_url("http://toplevel.example/");
   const GURL frame1_url("http://host1.example/");
   const GURL frame2_url("http://host2.example:999/");
 
   NavigateAndCommit(page_url);
-  RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
-      contents();
+  TabSpecificContentSettings* content_settings =
+      contents()->GetTabSpecificContentSettings();
 
   // One permitted frame, but not in the content map: requires reload.
-  render_view_host_delegate->OnGeolocationPermissionSet(frame1_url, true);
+  content_settings->OnGeolocationPermissionSet(frame1_url, true);
   CheckGeolocationBubble(1, false, true);
 
   // Add it to the content map, should now have a clear link.
   GeolocationContentSettingsMap* setting_map =
       profile_->GetGeolocationContentSettingsMap();
   setting_map->SetContentSetting(frame1_url, page_url, CONTENT_SETTING_ALLOW);
   CheckGeolocationBubble(1, true, false);
 
   // Change the default to allow: no message needed.
   setting_map->SetDefaultContentSetting(CONTENT_SETTING_ALLOW);
   CheckGeolocationBubble(1, false, false);
 
   // Second frame denied, but not stored in the content map: requires reload.
-  render_view_host_delegate->OnGeolocationPermissionSet(frame2_url, false);
+  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);
 }