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

chrome/browser/extensions/menu_manager_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/menu_manager.h"
 
 #include <memory>
 #include <vector>

[jdoerrie, 2017/04/06 14:25:51]

#include <utility>

[vabr (Chromium), 2017/04/07 20:40:41]

Done.

 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 205 matching lines @@
   int type = MenuItem::CHECKBOX;
   std::string title("TITLE");
   bool checked = true;
   bool enabled = true;
   MenuItem::ContextList contexts;
   contexts.Add(MenuItem::PAGE);
   contexts.Add(MenuItem::SELECTION);
   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/*");
 
   base::DictionaryValue value;
   value.SetBoolean("incognito", incognito);
   value.SetString("string_uid", std::string());
   value.SetInteger("type", type);
   value.SetString("title", title);
   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::string error;
   std::unique_ptr<MenuItem> item(
       MenuItem::Populate(extension->id(), value, &error));
   ASSERT_TRUE(item.get());
 
   EXPECT_EQ(extension->id(), item->extension_id());
   EXPECT_EQ(incognito, item->incognito());
   EXPECT_EQ(title, item->title());
   EXPECT_EQ(checked, item->checked());
   EXPECT_EQ(item->checked(), item->checked());
   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());
 }
 
 // Tests that deleting a parent properly removes descendants.
 TEST_F(MenuManagerTest, DeleteParent) {
   Extension* extension = AddExtension("1111");
 
   // Set up 5 items to add.
   std::unique_ptr<MenuItem> item1 = CreateTestItem(extension);
   std::unique_ptr<MenuItem> item2 = CreateTestItem(extension);
@@ skipping 484 matching lines @@
   EXPECT_EQ(4u, manager_.MenuItems(key1)->size());
   EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 
   // Remove all context menu items with incognito true.
   manager_.RemoveAllIncognitoContextItems();
   EXPECT_EQ(2u, manager_.MenuItems(key1)->size());
   EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 }
 
 }  // namespace extensions