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

Unified Diff: chrome/browser/extensions/menu_manager_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/menu_manager_unittest.cc
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index a4840e9c110e6119b9dce8f55f669741b145a393..200340a6ce394f8d5056d0a904a8135033bfd9cf 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -231,11 +231,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 +247,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 +269,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());
}

Powered by Google App Engine
This is Rietveld 408576698