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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Fix SupervisedUserWhitelistInstaller Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index cdaa34db3184db2b36ac0d62377258c00bf9fe7c..faeac217a27d23df93fe78526e5cc9d38b99f4c2 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -9,6 +9,7 @@
#include <memory>
jdoerrie 2017/04/06 14:25:50 #include <utility>
vabr (Chromium) 2017/04/07 20:40:40 Done.
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/common/extensions/api/permissions.h"
#include "extensions/common/permissions/permission_set.h"
@@ -95,7 +96,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
// Origins shouldn't have to be present.
{
Permissions permissions_object;
- value->Set("permissions", apis->DeepCopy());
+ value->Set("permissions", apis->CreateDeepCopy());
EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
permissions = UnpackPermissionSet(permissions_object, true, &error);
EXPECT_TRUE(permissions->HasAPIPermission(APIPermission::kTab));
@@ -107,7 +108,7 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- value->Set("origins", origins->DeepCopy());
+ value->Set("origins", origins->CreateDeepCopy());
EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
permissions = UnpackPermissionSet(permissions_object, true, &error);
EXPECT_TRUE(permissions.get());
@@ -119,9 +120,9 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- std::unique_ptr<base::ListValue> invalid_apis(apis->DeepCopy());
+ std::unique_ptr<base::ListValue> invalid_apis = apis->CreateDeepCopy();
invalid_apis->AppendInteger(3);
- value->Set("permissions", invalid_apis->DeepCopy());
+ value->Set("permissions", std::move(invalid_apis));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
@@ -129,9 +130,10 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- std::unique_ptr<base::ListValue> invalid_origins(origins->DeepCopy());
+ std::unique_ptr<base::ListValue> invalid_origins =
+ origins->CreateDeepCopy();
invalid_origins->AppendInteger(3);
- value->Set("origins", invalid_origins->DeepCopy());
+ value->Set("origins", std::move(invalid_origins));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
@@ -139,14 +141,14 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- value->Set("origins", new base::Value(2));
+ value->Set("origins", base::MakeUnique<base::Value>(2));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
{
Permissions permissions_object;
value->Clear();
- value->Set("permissions", new base::Value(2));
+ value->Set("permissions", base::MakeUnique<base::Value>(2));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
@@ -154,8 +156,8 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- value->Set("origins", origins->DeepCopy());
- value->Set("random", new base::Value(3));
+ value->Set("origins", origins->CreateDeepCopy());
+ value->Set("random", base::MakeUnique<base::Value>(3));
EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
permissions = UnpackPermissionSet(permissions_object, true, &error);
EXPECT_TRUE(permissions.get());
@@ -167,9 +169,9 @@ TEST(ExtensionPermissionsAPIHelpers, Unpack) {
{
Permissions permissions_object;
value->Clear();
- std::unique_ptr<base::ListValue> invalid_apis(apis->DeepCopy());
+ std::unique_ptr<base::ListValue> invalid_apis = apis->CreateDeepCopy();
invalid_apis->AppendString("unknown_permission");
- value->Set("permissions", invalid_apis->DeepCopy());
+ value->Set("permissions", std::move(invalid_apis));
EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
permissions = UnpackPermissionSet(permissions_object, true, &error);
EXPECT_FALSE(permissions.get());

Powered by Google App Engine
This is Rietveld 408576698