summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_setting_bubble_model_unittest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 10:00:58 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 10:00:58 +0000
commit46ba9087f6fe10e5d9ce94cd84b2311ac264f423 (patch)
tree0a2916bdb5a204124017e78a4d6f8cf0e35707ec /chrome/browser/content_setting_bubble_model_unittest.cc
parentf31208dd5a80964dc4724f95efb5b50ec3026cae (diff)
downloadchromium_src-46ba9087f6fe10e5d9ce94cd84b2311ac264f423.zip
chromium_src-46ba9087f6fe10e5d9ce94cd84b2311ac264f423.tar.gz
chromium_src-46ba9087f6fe10e5d9ce94cd84b2311ac264f423.tar.bz2
Move content settings related events into their own delegate.
This will allow for implementing content settings related handlers outside of the tab contents object. BUG=45230 TEST=none Review URL: http://codereview.chromium.org/2870015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_bubble_model_unittest.cc')
-rw-r--r--chrome/browser/content_setting_bubble_model_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/content_setting_bubble_model_unittest.cc b/chrome/browser/content_setting_bubble_model_unittest.cc
index dbcd2b0..0e3e8e5 100644
--- a/chrome/browser/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/content_setting_bubble_model_unittest.cc
@@ -43,7 +43,8 @@ class ContentSettingBubbleModelTest : public RenderViewHostTestHarness {
};
TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
- RenderViewHostDelegate::Resource* render_view_host_delegate = contents();
+ RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
+ contents();
render_view_host_delegate->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES);
scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
@@ -58,7 +59,8 @@ TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
}
TEST_F(ContentSettingBubbleModelTest, Cookies) {
- RenderViewHostDelegate::Resource* render_view_host_delegate = contents();
+ RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
+ contents();
render_view_host_delegate->OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES);
scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
@@ -77,7 +79,8 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {
const GURL frame2_url("http://host2.example:999/");
NavigateAndCommit(page_url);
- RenderViewHostDelegate::Resource* render_view_host_delegate = contents();
+ RenderViewHostDelegate::ContentSettings* render_view_host_delegate =
+ contents();
// One permitted frame, but not in the content map: requires reload.
render_view_host_delegate->OnGeolocationPermissionSet(frame1_url, true);