[patch] Chromium 71: Remove LazyRE2 that isn't available in stable re2 package (optional)

chromium-71-re2.patch (text/plain), 1.90 KB, created by Garry Filakhtov on 2018-10-25 10:44:50 UTC

diff --git a/chrome/browser/browser_switcher/alternative_browser_driver_linux.cc b/chrome/browser/browser_switcher/alternative_browser_driver_linux.cc
index 5e6dded..c19e435 100644
--- a/chrome/browser/browser_switcher/alternative_browser_driver_linux.cc
+++ b/chrome/browser/browser_switcher/alternative_browser_driver_linux.cc
@@ -53,13 +53,13 @@ void ExpandTilde(std::string* arg) {
 }
 
 void ExpandEnvironmentVariables(std::string* arg) {
-  static re2::LazyRE2 re = {
+  static re2::RE2 re = {
       "\\$\\{([a-zA-Z_][a-zA-Z_0-9]*)\\}|\\$([a-zA-Z_][a-zA-Z_0-9]*)"};
   std::string out;
   re2::StringPiece submatch[3] = {0};
   size_t start = 0;
   bool matched = false;
-  while (re->Match(*arg, start, arg->size(), re2::RE2::Anchor::UNANCHORED,
+  while (re.Match(*arg, start, arg->size(), re2::RE2::Anchor::UNANCHORED,
                    submatch, base::size(submatch))) {
     out.append(*arg, start, submatch[0].data() - (arg->data() + start));
     if (submatch[0] == kUrlVarName) {
diff --git a/chrome/browser/browser_switcher/browser_switcher_sitelist.cc b/chrome/browser/browser_switcher/browser_switcher_sitelist.cc
index 7a2a47f..98ce232 100644
--- a/chrome/browser/browser_switcher/browser_switcher_sitelist.cc
+++ b/chrome/browser/browser_switcher/browser_switcher_sitelist.cc
@@ -40,9 +40,9 @@ bool StringContainsInsensitiveASCII(base::StringPiece input,
 // Checks if the omitted prefix for a non-fully specific prefix is one of the
 // expected parts that are allowed to be omitted (e.g. "https://").
 bool IsValidPrefix(base::StringPiece prefix) {
-  static re2::LazyRE2 re = {"(https?|file):(//)?"};
+  static re2::RE2 re = {"(https?|file):(//)?"};
   re2::StringPiece converted_prefix(prefix.data(), prefix.size());
-  return (prefix.empty() || re2::RE2::FullMatch(converted_prefix, *re));
+  return (prefix.empty() || re2::RE2::FullMatch(converted_prefix, re));
 }
 
 bool IsInverted(base::StringPiece pattern) {