Change make_scoped_refptr() to MakeRefCounted().
Switch usage of make_scoped_refptr() to base::MakeRefCounted() where
possible. This automatically constructs the contained type and reduces
boilerplate.
Bug: 765333
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ic4f46bd7c0eff2bbb68fa51cb1720fdb5c194e80
Reviewed-on: https://chromium-review.googlesource.com/685510
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: danakj <[email protected]>
Commit-Queue: kylechar <[email protected]>
Cr-Commit-Position: refs/heads/master@{#506057}diff --git a/components/url_matcher/url_matcher_unittest.cc b/components/url_matcher/url_matcher_unittest.cc
index 3fa9377e..7c3f7c21 100644
--- a/components/url_matcher/url_matcher_unittest.cc
+++ b/components/url_matcher/url_matcher_unittest.cc
@@ -830,8 +830,8 @@
const int kConditionSetId1 = 1;
URLMatcherConditionSet::Vector insert1;
- insert1.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId1, conditions1)));
+ insert1.push_back(base::MakeRefCounted<URLMatcherConditionSet>(
+ kConditionSetId1, conditions1));
matcher.AddConditionSets(insert1);
EXPECT_EQ(1u, matcher.MatchURL(url1).size());
EXPECT_EQ(0u, matcher.MatchURL(url2).size());
@@ -842,8 +842,8 @@
const int kConditionSetId2 = 2;
URLMatcherConditionSet::Vector insert2;
- insert2.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId2, conditions2)));
+ insert2.push_back(base::MakeRefCounted<URLMatcherConditionSet>(
+ kConditionSetId2, conditions2));
matcher.AddConditionSets(insert2);
EXPECT_EQ(2u, matcher.MatchURL(url1).size());
EXPECT_EQ(1u, matcher.MatchURL(url2).size());
@@ -859,8 +859,8 @@
const int kConditionSetId3 = 3;
URLMatcherConditionSet::Vector insert3;
- insert3.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId3, conditions3)));
+ insert3.push_back(base::MakeRefCounted<URLMatcherConditionSet>(
+ kConditionSetId3, conditions3));
matcher.AddConditionSets(insert3);
EXPECT_EQ(3u, matcher.MatchURL(url1).size());
EXPECT_EQ(1u, matcher.MatchURL(url2).size());
@@ -945,8 +945,8 @@
const int kConditionSetId = 1;
URLMatcherConditionSet::Vector insert;
- insert.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId, conditions)));
+ insert.push_back(base::MakeRefCounted<URLMatcherConditionSet>(kConditionSetId,
+ conditions));
matcher.AddConditionSets(insert);
EXPECT_EQ(1u, matcher.MatchURL(url).size());
}
@@ -963,8 +963,8 @@
conditions.insert(factory->CreateOriginAndPathMatchesCondition("w..hp"));
const int kConditionSetId = 1;
URLMatcherConditionSet::Vector insert;
- insert.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId, conditions)));
+ insert.push_back(base::MakeRefCounted<URLMatcherConditionSet>(kConditionSetId,
+ conditions));
matcher.AddConditionSets(insert);
EXPECT_EQ(1u, matcher.MatchURL(url).size());
}
@@ -981,8 +981,8 @@
conditions.insert(factory->CreateOriginAndPathMatchesCondition("val"));
const int kConditionSetId = 1;
URLMatcherConditionSet::Vector insert;
- insert.push_back(make_scoped_refptr(
- new URLMatcherConditionSet(kConditionSetId, conditions)));
+ insert.push_back(base::MakeRefCounted<URLMatcherConditionSet>(kConditionSetId,
+ conditions));
matcher.AddConditionSets(insert);
EXPECT_EQ(0u, matcher.MatchURL(url).size());
}
