diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-26 14:45:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 22:46:08 +0000 |
| commit | 51ace48ad51bae53cef3d63a27fbabeb7d0ecafa (patch) | |
| tree | 75688ca279a49d844a7f7b08026836c7e352ccfd /components/url_matcher | |
| parent | 4a9d9829bc889e6a2cc02dbc443d3032e1d2c81f (diff) | |
| download | chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.zip chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.gz chromium_src-51ace48ad51bae53cef3d63a27fbabeb7d0ecafa.tar.bz2 | |
Convert Pass()→std::move() in //components/[n-z]*
BUG=557422
R=avi@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1548203002
Cr-Commit-Position: refs/heads/master@{#366914}
Diffstat (limited to 'components/url_matcher')
| -rw-r--r-- | components/url_matcher/url_matcher.cc | 9 | ||||
| -rw-r--r-- | components/url_matcher/url_matcher_factory.cc | 4 | ||||
| -rw-r--r-- | components/url_matcher/url_matcher_unittest.cc | 14 |
3 files changed, 15 insertions, 12 deletions
diff --git a/components/url_matcher/url_matcher.cc b/components/url_matcher/url_matcher.cc index 67fc3f6..5281c9f 100644 --- a/components/url_matcher/url_matcher.cc +++ b/components/url_matcher/url_matcher.cc @@ -6,6 +6,7 @@ #include <algorithm> #include <iterator> +#include <utility> #include "base/logging.h" #include "base/stl_util.h" @@ -742,8 +743,8 @@ URLMatcherConditionSet::URLMatcherConditionSet( scoped_ptr<URLMatcherPortFilter> port_filter) : id_(id), conditions_(conditions), - scheme_filter_(scheme_filter.Pass()), - port_filter_(port_filter.Pass()) {} + scheme_filter_(std::move(scheme_filter)), + port_filter_(std::move(port_filter)) {} URLMatcherConditionSet::URLMatcherConditionSet( ID id, @@ -754,8 +755,8 @@ URLMatcherConditionSet::URLMatcherConditionSet( : id_(id), conditions_(conditions), query_conditions_(query_conditions), - scheme_filter_(scheme_filter.Pass()), - port_filter_(port_filter.Pass()) {} + scheme_filter_(std::move(scheme_filter)), + port_filter_(std::move(port_filter)) {} bool URLMatcherConditionSet::IsMatch( const std::set<StringPattern::ID>& matching_patterns, diff --git a/components/url_matcher/url_matcher_factory.cc b/components/url_matcher/url_matcher_factory.cc index 31d0167..ac5522e 100644 --- a/components/url_matcher/url_matcher_factory.cc +++ b/components/url_matcher/url_matcher_factory.cc @@ -6,6 +6,7 @@ #include <algorithm> #include <cctype> +#include <utility> #include "base/lazy_instance.h" #include "base/logging.h" @@ -159,7 +160,8 @@ URLMatcherFactory::CreateFromURLFilterDictionary( scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set( new URLMatcherConditionSet(id, url_matcher_conditions, - url_matcher_schema_filter.Pass(), url_matcher_port_filter.Pass())); + std::move(url_matcher_schema_filter), + std::move(url_matcher_port_filter))); return url_matcher_condition_set; } diff --git a/components/url_matcher/url_matcher_unittest.cc b/components/url_matcher/url_matcher_unittest.cc index 7219d60..a027a42 100644 --- a/components/url_matcher/url_matcher_unittest.cc +++ b/components/url_matcher/url_matcher_unittest.cc @@ -5,6 +5,7 @@ #include "components/url_matcher/url_matcher.h" #include <stddef.h> +#include <utility> #include "base/macros.h" #include "base/strings/string_util.h" @@ -498,8 +499,9 @@ TEST(URLMatcherConditionSetTest, Matching) { ranges.push_back(URLMatcherPortFilter::CreateRange(80)); scoped_ptr<URLMatcherPortFilter> filter(new URLMatcherPortFilter(ranges)); scoped_refptr<URLMatcherConditionSet> condition_set4( - new URLMatcherConditionSet( - 1, conditions, scoped_ptr<URLMatcherSchemeFilter>(), filter.Pass())); + new URLMatcherConditionSet(1, conditions, + scoped_ptr<URLMatcherSchemeFilter>(), + std::move(filter))); EXPECT_TRUE(condition_set4->IsMatch(matching_patterns, url1)); EXPECT_TRUE(condition_set4->IsMatch(matching_patterns, url3)); EXPECT_FALSE(condition_set4->IsMatch(matching_patterns, url4)); @@ -563,11 +565,9 @@ bool IsQueryMatch( scoped_ptr<URLMatcherPortFilter> port_filter; scoped_refptr<URLMatcherConditionSet> condition_set( - new URLMatcherConditionSet(1, - conditions, - query_conditions, - scheme_filter.Pass(), - port_filter.Pass())); + new URLMatcherConditionSet(1, conditions, query_conditions, + std::move(scheme_filter), + std::move(port_filter))); GURL url("http://www.example.com/foo?" + url_query); |