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

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

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests Created 3 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/permission_manager.h" 5 #include "chrome/browser/permissions/permission_manager.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 9 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
10 #include "chrome/browser/permissions/permission_manager_factory.h" 10 #include "chrome/browser/permissions/permission_manager_factory.h"
11 #include "chrome/browser/permissions/permission_result.h"
11 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
12 #include "components/content_settings/core/browser/host_content_settings_map.h" 13 #include "components/content_settings/core/browser/host_content_settings_map.h"
13 #include "content/public/browser/permission_type.h" 14 #include "content/public/browser/permission_type.h"
14 #include "content/public/test/test_browser_thread_bundle.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 17
17 using blink::mojom::PermissionStatus; 18 using blink::mojom::PermissionStatus;
18 using content::PermissionType; 19 using content::PermissionType;
19 20
20 namespace { 21 namespace {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 HostContentSettingsMap* GetHostContentSettingsMap() { 55 HostContentSettingsMap* GetHostContentSettingsMap() {
55 return HostContentSettingsMapFactory::GetForProfile(&profile_); 56 return HostContentSettingsMapFactory::GetForProfile(&profile_);
56 } 57 }
57 58
58 void CheckPermissionStatus(PermissionType type, 59 void CheckPermissionStatus(PermissionType type,
59 PermissionStatus expected) { 60 PermissionStatus expected) {
60 EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus( 61 EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus(
61 type, url_.GetOrigin(), url_.GetOrigin())); 62 type, url_.GetOrigin(), url_.GetOrigin()));
62 } 63 }
63 64
65 void CheckPermissionResult(ContentSettingsType type,
66 ContentSetting expected_status,
67 PermissionStatusSource expected_status_source) {
68 PermissionResult result = GetPermissionManager()->GetPermissionStatus(
69 type, url_.GetOrigin(), url_.GetOrigin());
70 EXPECT_EQ(expected_status, result.content_setting);
71 EXPECT_EQ(expected_status_source, result.source);
72 }
73
64 void SetPermission(ContentSettingsType type, ContentSetting value) { 74 void SetPermission(ContentSettingsType type, ContentSetting value) {
65 HostContentSettingsMapFactory::GetForProfile(&profile_) 75 HostContentSettingsMapFactory::GetForProfile(&profile_)
66 ->SetContentSettingDefaultScope(url_, url_, type, std::string(), value); 76 ->SetContentSettingDefaultScope(url_, url_, type, std::string(), value);
67 } 77 }
68 78
69 const GURL& url() const { 79 const GURL& url() const {
70 return url_; 80 return url_;
71 } 81 }
72 82
73 const GURL& other_url() const { 83 const GURL& other_url() const {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 CheckPermissionStatus(PermissionType::MIDI_SYSEX, PermissionStatus::GRANTED); 129 CheckPermissionStatus(PermissionType::MIDI_SYSEX, PermissionStatus::GRANTED);
120 130
121 #if defined(OS_ANDROID) 131 #if defined(OS_ANDROID)
122 SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 132 SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
123 CONTENT_SETTING_ALLOW); 133 CONTENT_SETTING_ALLOW);
124 CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER, 134 CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
125 PermissionStatus::GRANTED); 135 PermissionStatus::GRANTED);
126 #endif 136 #endif
127 } 137 }
128 138
139 TEST_F(PermissionManagerTest, CheckPersmissionResultDefault) {
140 CheckPermissionResult(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ASK,
141 PermissionStatusSource::UNSPECIFIED);
142 CheckPermissionResult(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
143 CONTENT_SETTING_ASK,
144 PermissionStatusSource::UNSPECIFIED);
145 CheckPermissionResult(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
146 CONTENT_SETTING_ASK,
147 PermissionStatusSource::UNSPECIFIED);
148 CheckPermissionResult(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ASK,
149 PermissionStatusSource::UNSPECIFIED);
150 #if defined(OS_ANDROID)
151 CheckPermissionResult(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
152 CONTENT_SETTING_ASK,
153 PermissionStatusSource::UNSPECIFIED);
154 #endif
155 }
156
157 TEST_F(PermissionManagerTest, CheckPermissionResultAfterSet) {
158 SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
159 CheckPermissionResult(CONTENT_SETTINGS_TYPE_GEOLOCATION,
160 CONTENT_SETTING_ALLOW,
161 PermissionStatusSource::UNSPECIFIED);
162
163 SetPermission(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW);
164 CheckPermissionResult(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
165 CONTENT_SETTING_ALLOW,
166 PermissionStatusSource::UNSPECIFIED);
167 CheckPermissionResult(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
168 CONTENT_SETTING_ALLOW,
169 PermissionStatusSource::UNSPECIFIED);
170
171 SetPermission(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW);
172 CheckPermissionResult(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW,
173 PermissionStatusSource::UNSPECIFIED);
174
175 #if defined(OS_ANDROID)
176 SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
177 CONTENT_SETTING_ALLOW);
178 CheckPermissionResult(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
179 CONTENT_SETTING_ALLOW,
180 PermissionStatusSource::UNSPECIFIED);
181 #endif
182 }
183
129 TEST_F(PermissionManagerTest, SameTypeChangeNotifies) { 184 TEST_F(PermissionManagerTest, SameTypeChangeNotifies) {
130 int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange( 185 int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
131 PermissionType::GEOLOCATION, url(), url(), 186 PermissionType::GEOLOCATION, url(), url(),
132 base::Bind(&PermissionManagerTest::OnPermissionChange, 187 base::Bind(&PermissionManagerTest::OnPermissionChange,
133 base::Unretained(this))); 188 base::Unretained(this)));
134 189
135 GetHostContentSettingsMap()->SetContentSettingDefaultScope( 190 GetHostContentSettingsMap()->SetContentSettingDefaultScope(
136 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), 191 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
137 CONTENT_SETTING_ALLOW); 192 CONTENT_SETTING_ALLOW);
138 193
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::ASK); 364 CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::ASK);
310 GetHostContentSettingsMap()->SetContentSettingDefaultScope( 365 GetHostContentSettingsMap()->SetContentSettingDefaultScope(
311 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), 366 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
312 CONTENT_SETTING_ALLOW); 367 CONTENT_SETTING_ALLOW);
313 CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::GRANTED); 368 CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::GRANTED);
314 369
315 EXPECT_FALSE(callback_called()); 370 EXPECT_FALSE(callback_called());
316 371
317 GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id); 372 GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
318 } 373 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | chrome/browser/plugins/flash_download_interception.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698