summaryrefslogtreecommitdiff
path: root/chromium/components/query_parser
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/components/query_parser
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
downloadqtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/query_parser')
-rw-r--r--chromium/components/query_parser/query_parser_unittest.cc8
-rw-r--r--chromium/components/query_parser/snippet_unittest.cc4
2 files changed, 6 insertions, 6 deletions
diff --git a/chromium/components/query_parser/query_parser_unittest.cc b/chromium/components/query_parser/query_parser_unittest.cc
index e99bf5a1101..b64e2b5af3e 100644
--- a/chromium/components/query_parser/query_parser_unittest.cc
+++ b/chromium/components/query_parser/query_parser_unittest.cc
@@ -4,7 +4,7 @@
#include <stddef.h>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/query_parser/query_parser.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -84,7 +84,7 @@ TEST_F(QueryParserTest, NumWords) {
{ "foo \"bar baz\" blah", 4 },
};
- for (size_t i = 0; i < arraysize(data); ++i) {
+ for (size_t i = 0; i < base::size(data); ++i) {
base::string16 query_string;
EXPECT_EQ(data[i].expected_word_count,
query_parser_.ParseQuery(base::UTF8ToUTF16(data[i].input),
@@ -120,7 +120,7 @@ TEST_F(QueryParserTest, ParseQueryNodesAndMatch) {
{ "\"foo blah\"", "\"foo blah\"", true, 1, 9, 0, 0 },
{ "foo blah", "\"foo bar blah\"", true, 1, 4, 9, 13 },
};
- for (size_t i = 0; i < arraysize(data); ++i) {
+ for (size_t i = 0; i < base::size(data); ++i) {
QueryParser parser;
query_parser::QueryNodeVector query_nodes;
parser.ParseQueryNodes(base::UTF8ToUTF16(data[i].query),
@@ -157,7 +157,7 @@ TEST_F(QueryParserTest, ParseQueryWords) {
{ "\"foo bar\"", "foo", "bar", "", 2 },
{ "\"foo bar\" a", "foo", "bar", "a", 3 },
};
- for (size_t i = 0; i < arraysize(data); ++i) {
+ for (size_t i = 0; i < base::size(data); ++i) {
std::vector<base::string16> results;
QueryParser parser;
parser.ParseQueryWords(base::UTF8ToUTF16(data[i].text),
diff --git a/chromium/components/query_parser/snippet_unittest.cc b/chromium/components/query_parser/snippet_unittest.cc
index c96fad68093..0d0b6e61c91 100644
--- a/chromium/components/query_parser/snippet_unittest.cc
+++ b/chromium/components/query_parser/snippet_unittest.cc
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "base/macros.h"
+#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -240,7 +240,7 @@ TEST(Snippets, ExtractMatchPositions) {
{ "0 0 1 2 0 0 1 1", 1, { 1, 3 } },
{ "0 0 1 1 0 0 5 2 0 0 10 1 0 0 3 10", 2, { 1, 2, 3, 13 } },
};
- for (size_t i = 0; i < arraysize(data); ++i) {
+ for (size_t i = 0; i < base::size(data); ++i) {
Snippet::MatchPositions matches;
Snippet::ExtractMatchPositions(data[i].offsets_string, "0", &matches);
EXPECT_EQ(data[i].expected_match_count, matches.size());