Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions

chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 
 #include <stddef.h>
 
 #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"
 #include "extensions/common/url_pattern_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using extensions::api::permissions::Permissions;
 using extensions::permissions_api_helpers::PackPermissionSet;
 using extensions::permissions_api_helpers::UnpackPermissionSet;
@@ skipping 66 matching lines @@
   std::unique_ptr<base::ListValue> origins(new base::ListValue());
   origins->AppendString("http://a.com/*");
 
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   std::unique_ptr<const PermissionSet> permissions;
   std::string error;
 
   // 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));
     EXPECT_TRUE(permissions.get());
     EXPECT_TRUE(error.empty());
   }
 
   // The api permissions don't need to be present either.
   {
     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());
     EXPECT_TRUE(error.empty());
     EXPECT_TRUE(permissions->HasExplicitAccessToOrigin(GURL("http://a.com/")));
   }
 
   // Throw errors for non-string API permissions.
   {
     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));
   }
 
   // Throw errors for non-string origins.
   {
     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));
   }
 
   // Throw errors when "origins" or "permissions" are not list values.
   {
     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));
   }
 
   // Additional fields should be allowed.
   {
     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());
     EXPECT_TRUE(error.empty());
     EXPECT_TRUE(permissions->HasExplicitAccessToOrigin(GURL("http://a.com/")));
   }
 
   // Unknown permissions should throw an error.
   {
     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());
     EXPECT_FALSE(error.empty());
     EXPECT_EQ(error, "'unknown_permission' is not a recognized permission.");
   }
 }
 
 }  // namespace extensions