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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing keygen_rules. Created 5 years, 1 month 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
« chrome/browser/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/strings/string16.h" 5 #include "base/strings/string16.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
9 #include "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "content/public/test/test_browser_thread.h" 10 #include "content/public/test/test_browser_thread.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 TabSpecificContentSettings* content_settings = 48 TabSpecificContentSettings* content_settings =
49 TabSpecificContentSettings::FromWebContents(web_contents()); 49 TabSpecificContentSettings::FromWebContents(web_contents());
50 net::CookieOptions options; 50 net::CookieOptions options;
51 51
52 // Check that after initializing, nothing is blocked. 52 // Check that after initializing, nothing is blocked.
53 EXPECT_FALSE( 53 EXPECT_FALSE(
54 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)); 54 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
55 EXPECT_FALSE( 55 EXPECT_FALSE(
56 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT)); 56 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
57 EXPECT_FALSE( 57 EXPECT_FALSE(
58 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
59 EXPECT_FALSE(
58 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS)); 60 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
59 EXPECT_FALSE( 61 EXPECT_FALSE(
60 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 62 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
61 EXPECT_FALSE( 63 EXPECT_FALSE(
62 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS)); 64 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
63 EXPECT_FALSE(content_settings->IsContentBlocked( 65 EXPECT_FALSE(content_settings->IsContentBlocked(
64 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 66 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
65 EXPECT_FALSE(content_settings->IsContentBlocked( 67 EXPECT_FALSE(content_settings->IsContentBlocked(
66 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 68 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
67 69
(...skipping 17 matching lines...) Expand all
85 std::string(), 87 std::string(),
86 std::string(), 88 std::string(),
87 std::string(), 89 std::string(),
88 std::string()); 90 std::string());
89 91
90 // Check that only the respective content types are affected. 92 // Check that only the respective content types are affected.
91 EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)); 93 EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
92 EXPECT_FALSE( 94 EXPECT_FALSE(
93 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT)); 95 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
94 EXPECT_FALSE( 96 EXPECT_FALSE(
97 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
98 EXPECT_FALSE(
95 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS)); 99 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
96 EXPECT_FALSE( 100 EXPECT_FALSE(
97 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 101 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
98 EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS)); 102 EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
99 EXPECT_TRUE(content_settings->IsContentBlocked( 103 EXPECT_TRUE(content_settings->IsContentBlocked(
100 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 104 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
101 EXPECT_TRUE(content_settings->IsContentBlocked( 105 EXPECT_TRUE(content_settings->IsContentBlocked(
102 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 106 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
103 content_settings->OnCookieChanged(GURL("http://google.com"), 107 content_settings->OnCookieChanged(GURL("http://google.com"),
104 GURL("http://google.com"), 108 GURL("http://google.com"),
(...skipping 10 matching lines...) Expand all
115 EXPECT_TRUE( 119 EXPECT_TRUE(
116 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 120 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
117 121
118 // Reset blocked content settings. 122 // Reset blocked content settings.
119 content_settings->ClearBlockedContentSettingsExceptForCookies(); 123 content_settings->ClearBlockedContentSettingsExceptForCookies();
120 EXPECT_FALSE( 124 EXPECT_FALSE(
121 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)); 125 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
122 EXPECT_FALSE( 126 EXPECT_FALSE(
123 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT)); 127 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
124 EXPECT_FALSE( 128 EXPECT_FALSE(
129 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
130 EXPECT_FALSE(
125 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS)); 131 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
126 EXPECT_TRUE( 132 EXPECT_TRUE(
127 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 133 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
128 EXPECT_FALSE( 134 EXPECT_FALSE(
129 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS)); 135 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
130 EXPECT_FALSE(content_settings->IsContentBlocked( 136 EXPECT_FALSE(content_settings->IsContentBlocked(
131 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 137 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
132 EXPECT_FALSE(content_settings->IsContentBlocked( 138 EXPECT_FALSE(content_settings->IsContentBlocked(
133 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 139 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
134 140
135 content_settings->ClearCookieSpecificContentSettings(); 141 content_settings->ClearCookieSpecificContentSettings();
136 EXPECT_FALSE( 142 EXPECT_FALSE(
137 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES)); 143 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
138 EXPECT_FALSE( 144 EXPECT_FALSE(
139 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT)); 145 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
140 EXPECT_FALSE( 146 EXPECT_FALSE(
147 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_KEYGEN));
148 EXPECT_FALSE(
141 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS)); 149 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
142 EXPECT_FALSE( 150 EXPECT_FALSE(
143 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES)); 151 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
144 EXPECT_FALSE( 152 EXPECT_FALSE(
145 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS)); 153 content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
146 EXPECT_FALSE(content_settings->IsContentBlocked( 154 EXPECT_FALSE(content_settings->IsContentBlocked(
147 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)); 155 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
148 EXPECT_FALSE(content_settings->IsContentBlocked( 156 EXPECT_FALSE(content_settings->IsContentBlocked(
149 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); 157 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
150 } 158 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 base::UTF8ToUTF16("text"), 259 base::UTF8ToUTF16("text"),
252 blocked_by_policy); 260 blocked_by_policy);
253 content_settings->OnLocalStorageAccessed(GURL("http://google.com"), 261 content_settings->OnLocalStorageAccessed(GURL("http://google.com"),
254 true, 262 true,
255 blocked_by_policy); 263 blocked_by_policy);
256 content_settings->OnWebDatabaseAccessed(GURL("http://google.com"), 264 content_settings->OnWebDatabaseAccessed(GURL("http://google.com"),
257 base::UTF8ToUTF16("name"), 265 base::UTF8ToUTF16("name"),
258 base::UTF8ToUTF16("display_name"), 266 base::UTF8ToUTF16("display_name"),
259 blocked_by_policy); 267 blocked_by_policy);
260 } 268 }
OLDNEW
« chrome/browser/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698