| 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/common/extensions/permissions/chrome_permission_message_provide
r.h" | 5 #include "chrome/common/extensions/permissions/chrome_permission_message_provide
r.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 11 #include "base/values.h" | 12 #include "base/values.h" |
| 12 #include "chrome/grit/generated_resources.h" | 13 #include "chrome/grit/generated_resources.h" |
| 13 #include "extensions/common/permissions/permission_set.h" | 14 #include "extensions/common/permissions/permission_set.h" |
| 14 #include "extensions/common/permissions/permissions_info.h" | 15 #include "extensions/common/permissions/permissions_info.h" |
| 15 #include "extensions/common/permissions/settings_override_permission.h" | 16 #include "extensions/common/permissions/settings_override_permission.h" |
| 16 #include "extensions/common/permissions/usb_device_permission.h" | 17 #include "extensions/common/permissions/usb_device_permission.h" |
| 17 #include "extensions/common/url_pattern_set.h" | 18 #include "extensions/common/url_pattern_set.h" |
| 18 #include "extensions/strings/grit/extensions_strings.h" | 19 #include "extensions/strings/grit/extensions_strings.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 151 |
| 151 EXPECT_FALSE(IsPrivilegeIncrease(granted_permissions, actual_permissions)); | 152 EXPECT_FALSE(IsPrivilegeIncrease(granted_permissions, actual_permissions)); |
| 152 | 153 |
| 153 // Just to be safe: Adding the permission (with or without parameter) should | 154 // Just to be safe: Adding the permission (with or without parameter) should |
| 154 // still be considered a privilege escalation. | 155 // still be considered a privilege escalation. |
| 155 EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), granted_permissions)); | 156 EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), granted_permissions)); |
| 156 EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), actual_permissions)); | 157 EXPECT_TRUE(IsPrivilegeIncrease(APIPermissionSet(), actual_permissions)); |
| 157 } | 158 } |
| 158 | 159 |
| 159 } // namespace extensions | 160 } // namespace extensions |
| OLD | NEW |