| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
| 9 #include "chrome/browser/search_engines/template_url_service_factory.h" | 9 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 GURL url_; | 167 GURL url_; |
| 168 }; | 168 }; |
| 169 | 169 |
| 170 TEST_F(PermissionBrowserClientTest, GetPermissionStatusDefault) { | 170 TEST_F(PermissionBrowserClientTest, GetPermissionStatusDefault) { |
| 171 using namespace content; | 171 using namespace content; |
| 172 CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_ASK); | 172 CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_ASK); |
| 173 CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_ASK); | 173 CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_ASK); |
| 174 CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_ASK); | 174 CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_ASK); |
| 175 CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_ASK); | 175 CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_ASK); |
| 176 #if defined(OS_ANDROID) | 176 #if defined(OS_ANDROID) |
| 177 CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA, PERMISSION_STATUS_ASK); | 177 CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER, |
| 178 PERMISSION_STATUS_ASK); |
| 178 #endif | 179 #endif |
| 179 } | 180 } |
| 180 | 181 |
| 181 TEST_F(PermissionBrowserClientTest, GetPermissionStatusAfterSet) { | 182 TEST_F(PermissionBrowserClientTest, GetPermissionStatusAfterSet) { |
| 182 using namespace content; | 183 using namespace content; |
| 183 SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); | 184 SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); |
| 184 CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_GRANTED); | 185 CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_GRANTED); |
| 185 | 186 |
| 186 SetPermission(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW); | 187 SetPermission(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW); |
| 187 CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_GRANTED); | 188 CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_GRANTED); |
| 188 | 189 |
| 189 SetPermission(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW); | 190 SetPermission(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW); |
| 190 CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_GRANTED); | 191 CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_GRANTED); |
| 191 | 192 |
| 192 SetPermission(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, CONTENT_SETTING_ALLOW); | 193 SetPermission(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, CONTENT_SETTING_ALLOW); |
| 193 CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_GRANTED); | 194 CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_GRANTED); |
| 194 | 195 |
| 195 #if defined(OS_ANDROID) | 196 #if defined(OS_ANDROID) |
| 196 SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, | 197 SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, |
| 197 CONTENT_SETTING_ALLOW); | 198 CONTENT_SETTING_ALLOW); |
| 198 CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA, PERMISSION_STATUS_GRANTED); | 199 CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER, |
| 200 PERMISSION_STATUS_GRANTED); |
| 199 #endif | 201 #endif |
| 200 } | 202 } |
| 201 | 203 |
| 202 } // namespace chrome | 204 } // namespace chrome |
| OLD | NEW |