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

chrome/browser/extensions/menu_manager_unittest.cc

Index: chrome/browser/extensions/menu_manager_unittest.cc
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index b44a82ef01da6b7a8a31cf4760478ae6ef9f96d9..871c0b7e67168ea745a19ae8b8c2c4634ef5397f 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/menu_manager.h"
 
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/files/scoped_temp_dir.h"
@@ -231,11 +232,11 @@ TEST_F(MenuManagerTest, PopulateFromValue) {
   int contexts_value = 0;
   ASSERT_TRUE(contexts.ToValue()->GetAsInteger(&contexts_value));
 
-  base::ListValue* document_url_patterns(new base::ListValue());
+  auto document_url_patterns = base::MakeUnique<base::ListValue>();
   document_url_patterns->AppendString("http://www.google.com/*");
   document_url_patterns->AppendString("http://www.reddit.com/*");
 
-  base::ListValue* target_url_patterns(new base::ListValue());
+  auto target_url_patterns = base::MakeUnique<base::ListValue>();
   target_url_patterns->AppendString("http://www.yahoo.com/*");
   target_url_patterns->AppendString("http://www.facebook.com/*");
 
@@ -247,10 +248,16 @@ TEST_F(MenuManagerTest, PopulateFromValue) {
   value.SetBoolean("checked", checked);
   value.SetBoolean("enabled", enabled);
   value.SetInteger("contexts", contexts_value);
-  value.Set("document_url_patterns", document_url_patterns);
-  value.Set("target_url_patterns", target_url_patterns);
-
   std::string error;
+  URLPatternSet document_url_pattern_set;
+  document_url_pattern_set.Populate(*document_url_patterns,
+                                    URLPattern::SCHEME_ALL, true, &error);
+  value.Set("document_url_patterns", std::move(document_url_patterns));
+  URLPatternSet target_url_pattern_set;
+  target_url_pattern_set.Populate(*target_url_patterns, URLPattern::SCHEME_ALL,
+                                  true, &error);
+  value.Set("target_url_patterns", std::move(target_url_patterns));
+
   std::unique_ptr<MenuItem> item(
       MenuItem::Populate(extension->id(), value, &error));
   ASSERT_TRUE(item.get());
@@ -263,18 +270,8 @@ TEST_F(MenuManagerTest, PopulateFromValue) {
   EXPECT_EQ(enabled, item->enabled());
   EXPECT_EQ(contexts, item->contexts());
 
-  URLPatternSet document_url_pattern_set;
-  document_url_pattern_set.Populate(*document_url_patterns,
-                                    URLPattern::SCHEME_ALL,
-                                    true,
-                                    &error);
   EXPECT_EQ(document_url_pattern_set, item->document_url_patterns());
 
-  URLPatternSet target_url_pattern_set;
-  target_url_pattern_set.Populate(*target_url_patterns,
-                                   URLPattern::SCHEME_ALL,
-                                   true,
-                                   &error);
   EXPECT_EQ(target_url_pattern_set, item->target_url_patterns());
 }