| Index: net/base/url_util.cc
|
| diff --git a/net/base/url_util.cc b/net/base/url_util.cc
|
| index 8540e193d3c53b32bfd3937c81ec4bba744fecda..cf3b74dadbb87ac8ded5dc38366a27e756a9c20b 100644
|
| --- a/net/base/url_util.cc
|
| +++ b/net/base/url_util.cc
|
| @@ -41,18 +41,16 @@ GURL AppendOrReplaceQueryParameter(const GURL& url,
|
| url::Component key_range, value_range;
|
| while (url::ExtractQueryKeyValue(input.data(), &cursor, &key_range,
|
| &value_range)) {
|
| - const base::StringPiece key(
|
| - input.data() + key_range.begin, key_range.len);
|
| - const base::StringPiece value(
|
| - input.data() + value_range.begin, value_range.len);
|
| + const base::StringPiece key(input.data() + key_range.begin, key_range.len);
|
| + const base::StringPiece value(input.data() + value_range.begin,
|
| + value_range.len);
|
| std::string key_value_pair;
|
| // Check |replaced| as only the first pair should be replaced.
|
| if (!replaced && key == param_name) {
|
| replaced = true;
|
| key_value_pair = (param_name + "=" + param_value);
|
| } else {
|
| - key_value_pair.assign(input.data(),
|
| - key_range.begin,
|
| + key_value_pair.assign(input.data(), key_range.begin,
|
| value_range.end() - key_range.begin);
|
| }
|
| if (!output.empty())
|
| @@ -72,8 +70,7 @@ GURL AppendOrReplaceQueryParameter(const GURL& url,
|
| }
|
|
|
| QueryIterator::QueryIterator(const GURL& url)
|
| - : url_(url),
|
| - at_end_(!url.is_valid()) {
|
| + : url_(url), at_end_(!url.is_valid()) {
|
| if (!at_end_) {
|
| query_ = url.parsed_for_possibly_invalid_spec().query;
|
| Advance();
|
| @@ -101,10 +98,8 @@ const std::string& QueryIterator::GetUnescapedValue() {
|
| DCHECK(!at_end_);
|
| if (value_.is_nonempty() && unescaped_value_.empty()) {
|
| unescaped_value_ = UnescapeURLComponent(
|
| - GetValue(),
|
| - UnescapeRule::SPACES |
|
| - UnescapeRule::URL_SPECIAL_CHARS |
|
| - UnescapeRule::REPLACE_PLUS_WITH_SPACE);
|
| + GetValue(), UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS |
|
| + UnescapeRule::REPLACE_PLUS_WITH_SPACE);
|
| }
|
| return unescaped_value_;
|
| }
|
| @@ -114,7 +109,7 @@ bool QueryIterator::IsAtEnd() const {
|
| }
|
|
|
| void QueryIterator::Advance() {
|
| - DCHECK (!at_end_);
|
| + DCHECK(!at_end_);
|
| key_.reset();
|
| value_.reset();
|
| unescaped_value_.clear();
|
|
|