OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_context_base.h" | 5 #include "chrome/browser/permissions/permission_context_base.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 95 |
96 DISALLOW_COPY_AND_ASSIGN(MockSafeBrowsingDatabaseManager); | 96 DISALLOW_COPY_AND_ASSIGN(MockSafeBrowsingDatabaseManager); |
97 }; | 97 }; |
98 | 98 |
99 } // namespace | 99 } // namespace |
100 | 100 |
101 class TestPermissionContext : public PermissionContextBase { | 101 class TestPermissionContext : public PermissionContextBase { |
102 public: | 102 public: |
103 TestPermissionContext(Profile* profile, | 103 TestPermissionContext(Profile* profile, |
104 const ContentSettingsType content_settings_type) | 104 const ContentSettingsType content_settings_type) |
105 : PermissionContextBase(profile, content_settings_type), | 105 : PermissionContextBase(profile, |
| 106 content_settings_type, |
| 107 blink::WebFeaturePolicyFeature::kNotFound), |
106 tab_context_updated_(false) {} | 108 tab_context_updated_(false) {} |
107 | 109 |
108 ~TestPermissionContext() override {} | 110 ~TestPermissionContext() override {} |
109 | 111 |
110 #if defined(OS_ANDROID) | 112 #if defined(OS_ANDROID) |
111 PermissionQueueController* GetInfoBarController() { | 113 PermissionQueueController* GetInfoBarController() { |
112 return GetQueueController(); | 114 return GetQueueController(); |
113 } | 115 } |
114 #endif | 116 #endif |
115 | 117 |
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
967 PermissionContextBaseTestsInstance, | 969 PermissionContextBaseTestsInstance, |
968 PermissionContextBaseTests, | 970 PermissionContextBaseTests, |
969 ::testing::Values(TestType::PERMISSION_REQUEST_MANAGER, | 971 ::testing::Values(TestType::PERMISSION_REQUEST_MANAGER, |
970 TestType::PERMISSION_QUEUE_CONTROLLER)); | 972 TestType::PERMISSION_QUEUE_CONTROLLER)); |
971 #else | 973 #else |
972 INSTANTIATE_TEST_CASE_P( | 974 INSTANTIATE_TEST_CASE_P( |
973 PermissionContextBaseTestsInstance, | 975 PermissionContextBaseTestsInstance, |
974 PermissionContextBaseTests, | 976 PermissionContextBaseTests, |
975 ::testing::Values(TestType::PERMISSION_REQUEST_MANAGER)); | 977 ::testing::Values(TestType::PERMISSION_REQUEST_MANAGER)); |
976 #endif | 978 #endif |
OLD | NEW |