diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
commit | 437cf0eb7842e8db4a5702b4e18a5b865e58042a (patch) | |
tree | 1f11c2defdb083f80235ace1e5835c1ba78f7100 /chrome/browser/host_content_settings_map_unittest.cc | |
parent | 6828a51a1dea514c9bb57826ff9f1c3879287b92 (diff) | |
download | chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.zip chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.gz chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.bz2 |
Revert "Implement HostContentSettingsMap"
This reverts commit r37508, as it was crashing on the reliability bots.
Review URL: http://codereview.chromium.org/556076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_content_settings_map_unittest.cc')
-rw-r--r-- | chrome/browser/host_content_settings_map_unittest.cc | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/chrome/browser/host_content_settings_map_unittest.cc b/chrome/browser/host_content_settings_map_unittest.cc deleted file mode 100644 index 721a68e..0000000 --- a/chrome/browser/host_content_settings_map_unittest.cc +++ /dev/null @@ -1,95 +0,0 @@ -// 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/host_content_settings_map.h" - -#include "chrome/test/testing_profile.h" -#include "testing/gtest/include/gtest/gtest.h" - - -namespace { - -class HostContentSettingsMapTest : public testing::Test { - public: - HostContentSettingsMapTest() - : ui_thread_(ChromeThread::UI, &message_loop_) {} - - protected: - MessageLoop message_loop_; - ChromeThread ui_thread_; -}; - -TEST_F(HostContentSettingsMapTest, DefaultValues) { - TestingProfile profile; - HostContentSettingsMap* host_content_settings_map = - profile.GetHostContentSettingsMap(); - - // Check setting of default permissions. - ContentPermissions perm; - ASSERT_TRUE(host_content_settings_map->SetDefaultContentPermission( - CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_PERMISSION_TYPE_BLOCK)); - ASSERT_TRUE(host_content_settings_map->SetDefaultContentPermission( - CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_PERMISSION_TYPE_ASK)); - ASSERT_FALSE(host_content_settings_map->SetDefaultContentPermission( - CONTENT_SETTINGS_TYPE_JAVASCRIPT, - CONTENT_PERMISSION_TYPE_DEFAULT)); - ASSERT_TRUE(host_content_settings_map->SetDefaultContentPermission( - CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_PERMISSION_TYPE_ALLOW)); - - // Check per host permissions returned. - perm.permissions[CONTENT_SETTINGS_TYPE_IMAGES] = - CONTENT_PERMISSION_TYPE_DEFAULT; - perm.permissions[CONTENT_SETTINGS_TYPE_PLUGINS] = - CONTENT_PERMISSION_TYPE_ALLOW; - perm.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT] = - CONTENT_PERMISSION_TYPE_ALLOW; - host_content_settings_map->SetPerHostContentSettings("example.com", perm); - perm = host_content_settings_map->GetPerHostContentSettings("example.com"); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_BLOCK, - perm.permissions[CONTENT_SETTINGS_TYPE_IMAGES]); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_ALLOW, - perm.permissions[CONTENT_SETTINGS_TYPE_PLUGINS]); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_ALLOW, - perm.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT]); - perm = host_content_settings_map->GetPerHostContentSettings("example.org"); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_BLOCK, - perm.permissions[CONTENT_SETTINGS_TYPE_IMAGES]); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_ASK, - perm.permissions[CONTENT_SETTINGS_TYPE_PLUGINS]); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_ALLOW, - perm.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT]); - - // Check returning settings for a given resource. - HostContentSettingsMap::HostContentPermissions permissions; - permissions = host_content_settings_map->GetAllPerHostContentPermissions( - CONTENT_SETTINGS_TYPE_IMAGES); - EXPECT_EQ(0U, permissions.size()); - permissions = host_content_settings_map->GetAllPerHostContentPermissions( - CONTENT_SETTINGS_TYPE_PLUGINS); - EXPECT_EQ(1U, permissions.size()); - EXPECT_EQ("example.com", permissions.begin()->first); - EXPECT_EQ(CONTENT_PERMISSION_TYPE_ALLOW, permissions.begin()->second); -} - -TEST_F(HostContentSettingsMapTest, ContentPermissions) { - ContentPermissions perm; - perm.permissions[CONTENT_SETTINGS_TYPE_IMAGES] = - CONTENT_PERMISSION_TYPE_BLOCK; - perm.permissions[CONTENT_SETTINGS_TYPE_PLUGINS] = - CONTENT_PERMISSION_TYPE_ASK; - perm.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT] = - CONTENT_PERMISSION_TYPE_ALLOW; - - int serialized = ContentPermissions::ToInteger(perm); - ContentPermissions result = ContentPermissions::FromInteger(serialized); - - EXPECT_EQ(perm.permissions[CONTENT_SETTINGS_TYPE_IMAGES], - result.permissions[CONTENT_SETTINGS_TYPE_IMAGES]); - EXPECT_EQ(perm.permissions[CONTENT_SETTINGS_TYPE_PLUGINS], - result.permissions[CONTENT_SETTINGS_TYPE_PLUGINS]); - EXPECT_EQ(perm.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT], - result.permissions[CONTENT_SETTINGS_TYPE_JAVASCRIPT]); -} - -} // namespace |