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

Side by Side Diff: chrome/browser/permissions/delegation_tracker_unittest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/permissions/delegation_tracker.h" 5 #include "chrome/browser/permissions/delegation_tracker.h"
6 6
7 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 7 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
8 #include "content/public/browser/permission_type.h"
9 #include "content/public/browser/render_frame_host.h" 8 #include "content/public/browser/render_frame_host.h"
10 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
11 #include "content/public/test/test_renderer_host.h" 10 #include "content/public/test/test_renderer_host.h"
12 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
13 #include "url/gurl.h" 12 #include "url/gurl.h"
14 13
15 using content::PermissionType;
16
17 const char* kOrigin1 = "https://google.com"; 14 const char* kOrigin1 = "https://google.com";
18 const char* kOrigin2 = "https://maps.google.com"; 15 const char* kOrigin2 = "https://maps.google.com";
19 const char* kOrigin3 = "https://example.com"; 16 const char* kOrigin3 = "https://example.com";
20 const char* kUniqueOrigin = "about:blank"; 17 const char* kUniqueOrigin = "about:blank";
21 18
22 class DelegationTrackerTest : public ChromeRenderViewHostTestHarness { 19 class DelegationTrackerTest : public ChromeRenderViewHostTestHarness {
23 protected: 20 protected:
24 content::RenderFrameHost* GetMainRFH(const char* origin) { 21 content::RenderFrameHost* GetMainRFH(const char* origin) {
25 content::RenderFrameHost* result = web_contents()->GetMainFrame(); 22 content::RenderFrameHost* result = web_contents()->GetMainFrame();
26 content::RenderFrameHostTester::For(result) 23 content::RenderFrameHostTester::For(result)
(...skipping 12 matching lines...) Expand all
39 content::RenderFrameHostTester::For(result)->SimulateNavigationCommit( 36 content::RenderFrameHostTester::For(result)->SimulateNavigationCommit(
40 GURL(origin)); 37 GURL(origin));
41 return result; 38 return result;
42 } 39 }
43 }; 40 };
44 41
45 TEST_F(DelegationTrackerTest, SingleFrame) { 42 TEST_F(DelegationTrackerTest, SingleFrame) {
46 DelegationTracker tracker; 43 DelegationTracker tracker;
47 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 44 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
48 45
49 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 46 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
50 } 47 }
51 48
52 TEST_F(DelegationTrackerTest, SingleAncestorSameOrigin) { 49 TEST_F(DelegationTrackerTest, SingleAncestorSameOrigin) {
53 DelegationTracker tracker; 50 DelegationTracker tracker;
54 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 51 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
55 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin1); 52 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin1);
56 53
57 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 54 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
58 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 55 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
59 } 56 }
60 57
61 TEST_F(DelegationTrackerTest, SingleAncestorNoDelegation) { 58 TEST_F(DelegationTrackerTest, SingleAncestorNoDelegation) {
62 DelegationTracker tracker; 59 DelegationTracker tracker;
63 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 60 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
64 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2); 61 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2);
65 62
66 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 63 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
67 EXPECT_FALSE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 64 EXPECT_FALSE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
68 } 65 }
69 66
70 TEST_F(DelegationTrackerTest, SingleAncestorPermissionDelegated) { 67 TEST_F(DelegationTrackerTest, SingleAncestorPermissionDelegated) {
71 DelegationTracker tracker; 68 DelegationTracker tracker;
72 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 69 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
73 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2); 70 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2);
74 71
75 tracker.SetDelegatedPermissions(child, {PermissionType::GEOLOCATION}); 72 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
76 73
77 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 74 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
78 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 75 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
79 EXPECT_FALSE(tracker.IsGranted(child, PermissionType::NOTIFICATIONS)); 76 EXPECT_FALSE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
80 } 77 }
81 78
82 TEST_F(DelegationTrackerTest, SingleAncestorMultiplePermissionsDelegated) { 79 TEST_F(DelegationTrackerTest, SingleAncestorMultiplePermissionsDelegated) {
83 DelegationTracker tracker; 80 DelegationTracker tracker;
84 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 81 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
85 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2); 82 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin2);
86 83
87 tracker.SetDelegatedPermissions( 84 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION,
88 child, {PermissionType::GEOLOCATION, PermissionType::NOTIFICATIONS}); 85 CONTENT_SETTINGS_TYPE_NOTIFICATIONS});
89 86
90 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 87 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
91 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::NOTIFICATIONS)); 88 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
92 } 89 }
93 90
94 TEST_F(DelegationTrackerTest, SingleAncestorMultipleChildren) { 91 TEST_F(DelegationTrackerTest, SingleAncestorMultipleChildren) {
95 DelegationTracker tracker; 92 DelegationTracker tracker;
96 content::RenderFrameHost* parent = GetMainRFH(kOrigin1); 93 content::RenderFrameHost* parent = GetMainRFH(kOrigin1);
97 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin2); 94 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin2);
98 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin2); 95 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin2);
99 96
100 tracker.SetDelegatedPermissions(child1, {PermissionType::GEOLOCATION}); 97 tracker.SetDelegatedPermissions(child1, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
101 98
102 EXPECT_TRUE(tracker.IsGranted(child1, PermissionType::GEOLOCATION)); 99 EXPECT_TRUE(tracker.IsGranted(child1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
103 EXPECT_FALSE(tracker.IsGranted(child2, PermissionType::GEOLOCATION)); 100 EXPECT_FALSE(tracker.IsGranted(child2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
104 } 101 }
105 102
106 TEST_F(DelegationTrackerTest, MultipleAncestorsNotDelegated) { 103 TEST_F(DelegationTrackerTest, MultipleAncestorsNotDelegated) {
107 DelegationTracker tracker; 104 DelegationTracker tracker;
108 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1); 105 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1);
109 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2); 106 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2);
110 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin3); 107 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin3);
111 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin3); 108 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin3);
112 109
113 tracker.SetDelegatedPermissions(child1, {PermissionType::GEOLOCATION}); 110 tracker.SetDelegatedPermissions(child1, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
114 111
115 EXPECT_FALSE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 112 EXPECT_FALSE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
116 EXPECT_FALSE(tracker.IsGranted(child1, PermissionType::GEOLOCATION)); 113 EXPECT_FALSE(tracker.IsGranted(child1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
117 EXPECT_FALSE(tracker.IsGranted(child2, PermissionType::GEOLOCATION)); 114 EXPECT_FALSE(tracker.IsGranted(child2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
118 } 115 }
119 116
120 TEST_F(DelegationTrackerTest, MultipleAncestorsDelegated) { 117 TEST_F(DelegationTrackerTest, MultipleAncestorsDelegated) {
121 DelegationTracker tracker; 118 DelegationTracker tracker;
122 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1); 119 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1);
123 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2); 120 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2);
124 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin3); 121 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin3);
125 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin3); 122 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin3);
126 123
127 tracker.SetDelegatedPermissions(parent, {PermissionType::GEOLOCATION}); 124 tracker.SetDelegatedPermissions(parent, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
128 tracker.SetDelegatedPermissions(child1, {PermissionType::GEOLOCATION}); 125 tracker.SetDelegatedPermissions(child1, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
129 126
130 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 127 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
131 EXPECT_TRUE(tracker.IsGranted(child1, PermissionType::GEOLOCATION)); 128 EXPECT_TRUE(tracker.IsGranted(child1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
132 EXPECT_FALSE(tracker.IsGranted(child2, PermissionType::GEOLOCATION)); 129 EXPECT_FALSE(tracker.IsGranted(child2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
133 } 130 }
134 131
135 TEST_F(DelegationTrackerTest, MultipleAncestorsSameOrigin) { 132 TEST_F(DelegationTrackerTest, MultipleAncestorsSameOrigin) {
136 DelegationTracker tracker; 133 DelegationTracker tracker;
137 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1); 134 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1);
138 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin1); 135 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin1);
139 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin1); 136 content::RenderFrameHost* child1 = AddChildRFH(parent, kOrigin1);
140 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin1); 137 content::RenderFrameHost* child2 = AddChildRFH(parent, kOrigin1);
141 138
142 tracker.SetDelegatedPermissions(parent, {PermissionType::GEOLOCATION}); 139 tracker.SetDelegatedPermissions(parent, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
143 tracker.SetDelegatedPermissions(child1, {PermissionType::GEOLOCATION}); 140 tracker.SetDelegatedPermissions(child1, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
144 141
145 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 142 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
146 EXPECT_TRUE(tracker.IsGranted(child1, PermissionType::GEOLOCATION)); 143 EXPECT_TRUE(tracker.IsGranted(child1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
147 EXPECT_TRUE(tracker.IsGranted(child2, PermissionType::GEOLOCATION)); 144 EXPECT_TRUE(tracker.IsGranted(child2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
148 } 145 }
149 146
150 TEST_F(DelegationTrackerTest, MultipleAncestorsComplexSinglePermission) { 147 TEST_F(DelegationTrackerTest, MultipleAncestorsComplexSinglePermission) {
151 DelegationTracker tracker; 148 DelegationTracker tracker;
152 content::RenderFrameHost* great_grandparent = GetMainRFH(kOrigin1); 149 content::RenderFrameHost* great_grandparent = GetMainRFH(kOrigin1);
153 content::RenderFrameHost* grandparent = 150 content::RenderFrameHost* grandparent =
154 AddChildRFH(great_grandparent, kOrigin2); 151 AddChildRFH(great_grandparent, kOrigin2);
155 content::RenderFrameHost* parent1 = AddChildRFH(grandparent, kOrigin2); 152 content::RenderFrameHost* parent1 = AddChildRFH(grandparent, kOrigin2);
156 content::RenderFrameHost* parent2 = AddChildRFH(grandparent, kOrigin3); 153 content::RenderFrameHost* parent2 = AddChildRFH(grandparent, kOrigin3);
157 content::RenderFrameHost* child = AddChildRFH(parent1, kOrigin3); 154 content::RenderFrameHost* child = AddChildRFH(parent1, kOrigin3);
158 155
159 tracker.SetDelegatedPermissions(grandparent, {PermissionType::GEOLOCATION}); 156 tracker.SetDelegatedPermissions(grandparent,
160 tracker.SetDelegatedPermissions(child, {PermissionType::GEOLOCATION}); 157 {CONTENT_SETTINGS_TYPE_GEOLOCATION});
158 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
161 159
162 EXPECT_TRUE(tracker.IsGranted(grandparent, PermissionType::GEOLOCATION)); 160 EXPECT_TRUE(
163 EXPECT_TRUE(tracker.IsGranted(parent1, PermissionType::GEOLOCATION)); 161 tracker.IsGranted(grandparent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
164 EXPECT_FALSE(tracker.IsGranted(parent2, PermissionType::GEOLOCATION)); 162 EXPECT_TRUE(tracker.IsGranted(parent1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
165 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 163 EXPECT_FALSE(tracker.IsGranted(parent2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
164 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
166 } 165 }
167 166
168 TEST_F(DelegationTrackerTest, MultipleAncestorsComplexMultiplePermissions) { 167 TEST_F(DelegationTrackerTest, MultipleAncestorsComplexMultiplePermissions) {
169 DelegationTracker tracker; 168 DelegationTracker tracker;
170 content::RenderFrameHost* great_grandparent = GetMainRFH(kOrigin1); 169 content::RenderFrameHost* great_grandparent = GetMainRFH(kOrigin1);
171 content::RenderFrameHost* grandparent = 170 content::RenderFrameHost* grandparent =
172 AddChildRFH(great_grandparent, kOrigin2); 171 AddChildRFH(great_grandparent, kOrigin2);
173 content::RenderFrameHost* parent1 = AddChildRFH(grandparent, kOrigin2); 172 content::RenderFrameHost* parent1 = AddChildRFH(grandparent, kOrigin2);
174 content::RenderFrameHost* parent2 = AddChildRFH(grandparent, kOrigin3); 173 content::RenderFrameHost* parent2 = AddChildRFH(grandparent, kOrigin3);
175 content::RenderFrameHost* child = AddChildRFH(parent1, kOrigin3); 174 content::RenderFrameHost* child = AddChildRFH(parent1, kOrigin3);
176 175
177 tracker.SetDelegatedPermissions(grandparent, {PermissionType::GEOLOCATION, 176 tracker.SetDelegatedPermissions(
178 PermissionType::NOTIFICATIONS}); 177 grandparent,
179 tracker.SetDelegatedPermissions(child, {PermissionType::GEOLOCATION}); 178 {CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTINGS_TYPE_NOTIFICATIONS});
179 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
180 180
181 EXPECT_TRUE(tracker.IsGranted(grandparent, PermissionType::GEOLOCATION)); 181 EXPECT_TRUE(
182 EXPECT_TRUE(tracker.IsGranted(grandparent, PermissionType::NOTIFICATIONS)); 182 tracker.IsGranted(grandparent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
183 EXPECT_TRUE(
184 tracker.IsGranted(grandparent, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
183 185
184 EXPECT_TRUE(tracker.IsGranted(parent1, PermissionType::GEOLOCATION)); 186 EXPECT_TRUE(tracker.IsGranted(parent1, CONTENT_SETTINGS_TYPE_GEOLOCATION));
185 EXPECT_TRUE(tracker.IsGranted(parent1, PermissionType::NOTIFICATIONS)); 187 EXPECT_TRUE(tracker.IsGranted(parent1, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
186 188
187 EXPECT_FALSE(tracker.IsGranted(parent2, PermissionType::GEOLOCATION)); 189 EXPECT_FALSE(tracker.IsGranted(parent2, CONTENT_SETTINGS_TYPE_GEOLOCATION));
188 EXPECT_FALSE(tracker.IsGranted(parent2, PermissionType::NOTIFICATIONS)); 190 EXPECT_FALSE(tracker.IsGranted(parent2, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
189 191
190 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 192 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
191 EXPECT_FALSE(tracker.IsGranted(child, PermissionType::NOTIFICATIONS)); 193 EXPECT_FALSE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
192 } 194 }
193 195
194 TEST_F(DelegationTrackerTest, RenderFrameHostChanged) { 196 TEST_F(DelegationTrackerTest, RenderFrameHostChanged) {
195 DelegationTracker tracker; 197 DelegationTracker tracker;
196 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1); 198 content::RenderFrameHost* grandparent = GetMainRFH(kOrigin1);
197 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2); 199 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2);
198 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin3); 200 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin3);
199 201
200 tracker.SetDelegatedPermissions(parent, {PermissionType::GEOLOCATION}); 202 tracker.SetDelegatedPermissions(parent, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
201 tracker.SetDelegatedPermissions(child, {PermissionType::GEOLOCATION}); 203 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
202 204
203 EXPECT_TRUE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 205 EXPECT_TRUE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
204 EXPECT_TRUE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 206 EXPECT_TRUE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
205 207
206 content::RenderFrameHostTester::For(parent)->SimulateNavigationCommit( 208 content::RenderFrameHostTester::For(parent)->SimulateNavigationCommit(
207 GURL(kUniqueOrigin)); 209 GURL(kUniqueOrigin));
208 210
209 EXPECT_FALSE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 211 EXPECT_FALSE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
210 EXPECT_FALSE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 212 EXPECT_FALSE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
211 } 213 }
212 214
213 TEST_F(DelegationTrackerTest, UniqueOrigins) { 215 TEST_F(DelegationTrackerTest, UniqueOrigins) {
214 DelegationTracker tracker; 216 DelegationTracker tracker;
215 content::RenderFrameHost* grandparent = GetMainRFH(kUniqueOrigin); 217 content::RenderFrameHost* grandparent = GetMainRFH(kUniqueOrigin);
216 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2); 218 content::RenderFrameHost* parent = AddChildRFH(grandparent, kOrigin2);
217 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin3); 219 content::RenderFrameHost* child = AddChildRFH(parent, kOrigin3);
218 220
219 tracker.SetDelegatedPermissions(parent, {PermissionType::GEOLOCATION}); 221 tracker.SetDelegatedPermissions(parent, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
220 tracker.SetDelegatedPermissions(child, {PermissionType::GEOLOCATION}); 222 tracker.SetDelegatedPermissions(child, {CONTENT_SETTINGS_TYPE_GEOLOCATION});
221 223
222 // Unique origins should never be able to delegate permission. 224 // Unique origins should never be able to delegate permission.
223 EXPECT_FALSE(tracker.IsGranted(parent, PermissionType::GEOLOCATION)); 225 EXPECT_FALSE(tracker.IsGranted(parent, CONTENT_SETTINGS_TYPE_GEOLOCATION));
224 EXPECT_FALSE(tracker.IsGranted(child, PermissionType::GEOLOCATION)); 226 EXPECT_FALSE(tracker.IsGranted(child, CONTENT_SETTINGS_TYPE_GEOLOCATION));
225 } 227 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/delegation_tracker.cc ('k') | chrome/browser/permissions/permission_blacklist_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698