| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/values.h" | 6 #include "base/values.h" |
| 7 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" | 7 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" |
| 8 #include "chrome/common/extensions/api/permissions.h" | 8 #include "chrome/common/extensions/api/permissions.h" |
| 9 #include "chrome/common/extensions/permissions/permission_set.h" | 9 #include "chrome/common/extensions/permissions/permission_set.h" |
| 10 #include "chrome/common/extensions/url_pattern_set.h" | 10 #include "extensions/common/url_pattern_set.h" |
| 11 #include "googleurl/src/gurl.h" | 11 #include "googleurl/src/gurl.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 13 |
| 14 using extensions::permissions_api_helpers::PackPermissionSet; | 14 using extensions::permissions_api_helpers::PackPermissionSet; |
| 15 using extensions::permissions_api_helpers::UnpackPermissionSet; | 15 using extensions::permissions_api_helpers::UnpackPermissionSet; |
| 16 using extensions::api::permissions::Permissions; | 16 using extensions::api::permissions::Permissions; |
| 17 using extensions::APIPermission; | 17 using extensions::APIPermission; |
| 18 using extensions::APIPermissionSet; | 18 using extensions::APIPermissionSet; |
| 19 using extensions::PermissionSet; | 19 using extensions::PermissionSet; |
| 20 using extensions::URLPatternSet; |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| 23 static void AddPattern(URLPatternSet* extent, const std::string& pattern) { | 24 static void AddPattern(URLPatternSet* extent, const std::string& pattern) { |
| 24 int schemes = URLPattern::SCHEME_ALL; | 25 int schemes = URLPattern::SCHEME_ALL; |
| 25 extent->AddPattern(URLPattern(schemes, pattern)); | 26 extent->AddPattern(URLPattern(schemes, pattern)); |
| 26 } | 27 } |
| 27 | 28 |
| 28 } // namespace | 29 } // namespace |
| 29 | 30 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 scoped_ptr<ListValue> invalid_apis(apis->DeepCopy()); | 166 scoped_ptr<ListValue> invalid_apis(apis->DeepCopy()); |
| 166 invalid_apis->Append(Value::CreateStringValue("unknown_permission")); | 167 invalid_apis->Append(Value::CreateStringValue("unknown_permission")); |
| 167 value->Set("permissions", invalid_apis->DeepCopy()); | 168 value->Set("permissions", invalid_apis->DeepCopy()); |
| 168 EXPECT_TRUE(Permissions::Populate(*value, &permissions_object)); | 169 EXPECT_TRUE(Permissions::Populate(*value, &permissions_object)); |
| 169 permissions = UnpackPermissionSet(permissions_object, &error); | 170 permissions = UnpackPermissionSet(permissions_object, &error); |
| 170 EXPECT_FALSE(permissions); | 171 EXPECT_FALSE(permissions); |
| 171 EXPECT_FALSE(error.empty()); | 172 EXPECT_FALSE(error.empty()); |
| 172 EXPECT_EQ(error, "'unknown_permission' is not a recognized permission."); | 173 EXPECT_EQ(error, "'unknown_permission' is not a recognized permission."); |
| 173 } | 174 } |
| 174 } | 175 } |
| OLD | NEW |