Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 This updates our copy of //base to be based off of commit 9659b08ea by performing the following commands: 1.) Check out //base at 9659b08ea 2.) Apply the //base portion of the following commits from mojo: 57ca940d8410a27fdf517b6194d7ecb0f29ecc2a c3b05c507e712f4ee65522e0a00e38c735c85244 d3482c6d25faabd04dffcea32d4dee18af74d600 18a6ce7215ece72e4359600852bb0cf5fd87339f a67383613f17083d918c31cf377932f5b43b91ab 0204e1a3a6679a0e634b66f661e23f424f044152 d423877725e8606e5ebac142e5c4b5c8c2dc4810 7a690c5c0344946ed74402d61d473502bc03ad77 cfeba3cce284f8a4d382337201d479768bb0eb77 df7f866ce3da1ef3c212cde977a6a77dc832ce22 57be778fd4d820b026165969352d7b40d476730b 34776a703d8cce41052e5a3867a23d8970fbb549 0f5eacecbe12aae15b114a8511ae718506431b37 c4ebd590b6e2749a4ab3f97fd49bbd3a4d510759 3.) Fix up the rest of the repo for //base API changes: *) StartsWith/EndsWith string functions are in base:: namespace and have slightly different options *) Tokenize replaced with base::SplitString *) MessageLoopProxy removed, use TaskRunner instead 4.) git cl format, gn format 5.) Delete OWNERS file import from //base/mac to //chrome/... This puts mojo's copy at base very close to parity with the flutter engine's copy. R=viettrungluu@chromium.org Review URL: https://codereview.chromium.org/1641513004 .
diff --git a/origin.cc b/origin.cc index 8aaa173..cebf5dd 100644 --- a/origin.cc +++ b/origin.cc
@@ -4,14 +4,15 @@ #include "url/origin.h" -#include "base/strings/string_util.h" +#include "base/logging.h" +#include "base/strings/pattern.h" namespace url { Origin::Origin() : string_("null") {} Origin::Origin(const std::string& origin) : string_(origin) { - DCHECK(origin == "null" || MatchPattern(origin, "?*://?*")); + DCHECK(origin == "null" || base::MatchPattern(origin, "?*://?*")); DCHECK_GT(origin.size(), 0u); DCHECK(origin == "file://" || origin[origin.size() - 1] != '/'); }