Skip to content

Commit

Permalink
Change std::find_if*() to use base:: functions: url/
Browse files Browse the repository at this point in the history
Goal: Slightly simpler and/or more semantically-accurate code.

Bug: none
Change-Id: I91eb49456878a9e8ba03a6166e238103188beae5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3910668
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Timothy Gu <timothygu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1050930}
  • Loading branch information
pkasting authored and Chromium LUCI CQ committed Sep 24, 2022
1 parent 5268248 commit 97348dd
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions url/url_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/containers/contains.h"
#include "base/no_destructor.h"
#include "base/strings/string_util.h"
#include "url/url_canon_internal.h"
Expand Down Expand Up @@ -522,10 +523,7 @@ void DoAddSchemeWithHandler(const char* new_scheme,
DCHECK(strlen(new_scheme) > 0);
DCHECK(strlen(handler) > 0);
DCHECK_EQ(base::ToLowerASCII(new_scheme), new_scheme);
DCHECK(std::find_if(schemes->begin(), schemes->end(),
[&new_scheme](const SchemeWithHandler& scheme) {
return scheme.scheme == new_scheme;
}) == schemes->end());
DCHECK(!base::Contains(*schemes, new_scheme, &SchemeWithHandler::scheme));
schemes->push_back({new_scheme, handler});
}

Expand All @@ -534,8 +532,7 @@ void DoAddScheme(const char* new_scheme, std::vector<std::string>* schemes) {
DCHECK(schemes);
DCHECK(strlen(new_scheme) > 0);
DCHECK_EQ(base::ToLowerASCII(new_scheme), new_scheme);
DCHECK(std::find(schemes->begin(), schemes->end(), new_scheme) ==
schemes->end());
DCHECK(!base::Contains(*schemes, new_scheme));
schemes->push_back(new_scheme);
}

Expand All @@ -546,10 +543,7 @@ void DoAddSchemeWithType(const char* new_scheme,
DCHECK(schemes);
DCHECK(strlen(new_scheme) > 0);
DCHECK_EQ(base::ToLowerASCII(new_scheme), new_scheme);
DCHECK(std::find_if(schemes->begin(), schemes->end(),
[&new_scheme](const SchemeWithType& scheme) {
return scheme.scheme == new_scheme;
}) == schemes->end());
DCHECK(!base::Contains(*schemes, new_scheme, &SchemeWithType::scheme));
schemes->push_back({new_scheme, type});
}

Expand Down

0 comments on commit 97348dd

Please sign in to comment.