Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/host_content_settings_map_unittest.cc

Issue 2815042: Add notifications content settings type. (Closed)
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/host_content_settings_map.cc ('k') | chrome/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/host_content_settings_map.h" 5 #include "chrome/browser/host_content_settings_map.h"
6 6
7 #include "chrome/browser/pref_service.h" 7 #include "chrome/browser/pref_service.h"
8 #include "chrome/common/notification_registrar.h" 8 #include "chrome/common/notification_registrar.h"
9 #include "chrome/common/notification_service.h" 9 #include "chrome/common/notification_service.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 desired_settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] = 130 desired_settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] =
131 CONTENT_SETTING_BLOCK; 131 CONTENT_SETTING_BLOCK;
132 host_content_settings_map->SetContentSetting(pattern, 132 host_content_settings_map->SetContentSetting(pattern,
133 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW); 133 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW);
134 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = 134 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] =
135 CONTENT_SETTING_ALLOW; 135 CONTENT_SETTING_ALLOW;
136 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = 136 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] =
137 CONTENT_SETTING_BLOCK; 137 CONTENT_SETTING_BLOCK;
138 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = 138 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] =
139 CONTENT_SETTING_ASK; 139 CONTENT_SETTING_ASK;
140 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] =
141 CONTENT_SETTING_ASK;
140 ContentSettings settings = 142 ContentSettings settings =
141 host_content_settings_map->GetContentSettings(host); 143 host_content_settings_map->GetContentSettings(host);
142 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); 144 EXPECT_TRUE(SettingsEqual(desired_settings, settings));
143 145
144 // Check returning all hosts for a setting. 146 // Check returning all hosts for a setting.
145 HostContentSettingsMap::Pattern pattern2("[*.]example.org"); 147 HostContentSettingsMap::Pattern pattern2("[*.]example.org");
146 host_content_settings_map->SetContentSetting(pattern2, 148 host_content_settings_map->SetContentSetting(pattern2,
147 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); 149 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK);
148 host_content_settings_map->SetContentSetting(pattern2, 150 host_content_settings_map->SetContentSetting(pattern2,
149 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); 151 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES] = 447 desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES] =
446 CONTENT_SETTING_BLOCK; 448 CONTENT_SETTING_BLOCK;
447 desired_settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] = 449 desired_settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] =
448 CONTENT_SETTING_BLOCK; 450 CONTENT_SETTING_BLOCK;
449 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] = 451 desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] =
450 CONTENT_SETTING_BLOCK; 452 CONTENT_SETTING_BLOCK;
451 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] = 453 desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] =
452 CONTENT_SETTING_BLOCK; 454 CONTENT_SETTING_BLOCK;
453 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] = 455 desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] =
454 CONTENT_SETTING_ASK; 456 CONTENT_SETTING_ASK;
457 desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] =
458 CONTENT_SETTING_ASK;
455 ContentSettings settings = 459 ContentSettings settings =
456 host_content_settings_map->GetContentSettings(host); 460 host_content_settings_map->GetContentSettings(host);
457 EXPECT_TRUE(SettingsEqual(desired_settings, settings)); 461 EXPECT_TRUE(SettingsEqual(desired_settings, settings));
458 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES], 462 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES],
459 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]); 463 settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]);
460 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES], 464 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES],
461 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]); 465 settings.settings[CONTENT_SETTINGS_TYPE_IMAGES]);
462 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS], 466 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS],
463 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]); 467 settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]);
464 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS], 468 EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS],
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_ALLOW); 509 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_ALLOW);
506 EXPECT_EQ(CONTENT_SETTING_BLOCK, 510 EXPECT_EQ(CONTENT_SETTING_BLOCK,
507 host_content_settings_map->GetContentSetting( 511 host_content_settings_map->GetContentSetting(
508 host, CONTENT_SETTINGS_TYPE_IMAGES)); 512 host, CONTENT_SETTINGS_TYPE_IMAGES));
509 EXPECT_EQ(CONTENT_SETTING_ALLOW, 513 EXPECT_EQ(CONTENT_SETTING_ALLOW,
510 otr_map->GetContentSetting( 514 otr_map->GetContentSetting(
511 host, CONTENT_SETTINGS_TYPE_IMAGES)); 515 host, CONTENT_SETTINGS_TYPE_IMAGES));
512 } 516 }
513 517
514 } // namespace 518 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/host_content_settings_map.cc ('k') | chrome/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698