diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-03 13:32:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 14:31:55 +0200 |
commit | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch) | |
tree | 91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/components/zucchini/heuristic_ensemble_matcher.cc | |
parent | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff) | |
download | qtwebengine-chromium-21ba0c5d4bf8fba15dddd97cd693bad2358b77fd.tar.gz |
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/components/zucchini/heuristic_ensemble_matcher.cc')
-rw-r--r-- | chromium/components/zucchini/heuristic_ensemble_matcher.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/components/zucchini/heuristic_ensemble_matcher.cc b/chromium/components/zucchini/heuristic_ensemble_matcher.cc index d6acdbd8355..c812cb4bdcb 100644 --- a/chromium/components/zucchini/heuristic_ensemble_matcher.cc +++ b/chromium/components/zucchini/heuristic_ensemble_matcher.cc @@ -26,9 +26,9 @@ namespace { /******** Helper Functions ********/ // Uses |detector| to find embedded executables inside |image|, and returns the -// result on success, or base::nullopt on failure, which occurs if too many (> +// result on success, or absl::nullopt on failure, which occurs if too many (> // |kElementLimit|) elements are found. -base::Optional<std::vector<Element>> FindEmbeddedElements( +absl::optional<std::vector<Element>> FindEmbeddedElements( ConstBufferView image, const std::string& name, ElementDetector&& detector) { @@ -46,7 +46,7 @@ base::Optional<std::vector<Element>> FindEmbeddedElements( } if (elements.size() >= kElementLimit) { LOG(WARNING) << name << ": Found too many elements."; - return base::nullopt; + return absl::nullopt; } LOG(INFO) << name << ": Found " << elements.size() << " elements."; return elements; @@ -246,12 +246,12 @@ bool HeuristicEnsembleMatcher::RunMatch(ConstBufferView old_image, LOG(INFO) << "Start matching."; // Find all elements in "old" and "new". - base::Optional<std::vector<Element>> old_elements = + absl::optional<std::vector<Element>> old_elements = FindEmbeddedElements(old_image, "Old file", base::BindRepeating(DetectElementFromDisassembler)); if (!old_elements.has_value()) return false; - base::Optional<std::vector<Element>> new_elements = + absl::optional<std::vector<Element>> new_elements = FindEmbeddedElements(new_image, "New file", base::BindRepeating(DetectElementFromDisassembler)); if (!new_elements.has_value()) |