diff options
Diffstat (limited to 'chrome/browser/history/query_parser_unittest.cc')
| -rw-r--r-- | chrome/browser/history/query_parser_unittest.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/history/query_parser_unittest.cc b/chrome/browser/history/query_parser_unittest.cc index fe4a505..969708d 100644 --- a/chrome/browser/history/query_parser_unittest.cc +++ b/chrome/browser/history/query_parser_unittest.cc @@ -25,8 +25,8 @@ class QueryParserTest : public testing::Test { // convenience) to a SQLite query string. std::string QueryParserTest::QueryToString(const std::string& query) { base::string16 sqlite_query; - query_parser_.ParseQuery(UTF8ToUTF16(query), &sqlite_query); - return UTF16ToUTF8(sqlite_query); + query_parser_.ParseQuery(base::UTF8ToUTF16(query), &sqlite_query); + return base::UTF16ToUTF8(sqlite_query); } // Basic multi-word queries, including prefix matching. @@ -39,12 +39,12 @@ TEST_F(QueryParserTest, SimpleQueries) { // the minimum is 2 while for other scripts, it's 3. EXPECT_EQ("f b", QueryToString(" f b")); // KA JANG - EXPECT_EQ(WideToUTF8(L"\xAC00 \xC7A5"), - QueryToString(WideToUTF8(L" \xAC00 \xC7A5"))); + EXPECT_EQ(base::WideToUTF8(L"\xAC00 \xC7A5"), + QueryToString(base::WideToUTF8(L" \xAC00 \xC7A5"))); EXPECT_EQ("foo* bar*", QueryToString(" foo bar ")); // KA-JANG BICH-GO - EXPECT_EQ(WideToUTF8(L"\xAC00\xC7A5* \xBE5B\xACE0*"), - QueryToString(WideToUTF8(L"\xAC00\xC7A5 \xBE5B\xACE0"))); + EXPECT_EQ(base::WideToUTF8(L"\xAC00\xC7A5* \xBE5B\xACE0*"), + QueryToString(base::WideToUTF8(L"\xAC00\xC7A5 \xBE5B\xACE0"))); } // Quoted substring parsing. @@ -82,7 +82,7 @@ TEST_F(QueryParserTest, NumWords) { for (size_t i = 0; i < arraysize(data); ++i) { base::string16 query_string; EXPECT_EQ(data[i].expected_word_count, - query_parser_.ParseQuery(UTF8ToUTF16(data[i].input), + query_parser_.ParseQuery(base::UTF8ToUTF16(data[i].input), &query_string)); } } @@ -117,10 +117,11 @@ TEST_F(QueryParserTest, ParseQueryNodesAndMatch) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { QueryParser parser; ScopedVector<QueryNode> query_nodes; - parser.ParseQueryNodes(UTF8ToUTF16(data[i].query), &query_nodes.get()); + parser.ParseQueryNodes(base::UTF8ToUTF16(data[i].query), + &query_nodes.get()); Snippet::MatchPositions match_positions; ASSERT_EQ(data[i].matches, - parser.DoesQueryMatch(UTF8ToUTF16(data[i].text), + parser.DoesQueryMatch(base::UTF8ToUTF16(data[i].text), query_nodes.get(), &match_positions)); size_t offset = 0; @@ -154,12 +155,12 @@ TEST_F(QueryParserTest, ParseQueryWords) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { std::vector<base::string16> results; QueryParser parser; - parser.ParseQueryWords(UTF8ToUTF16(data[i].text), &results); + parser.ParseQueryWords(base::UTF8ToUTF16(data[i].text), &results); ASSERT_EQ(data[i].word_count, results.size()); - EXPECT_EQ(data[i].w1, UTF16ToUTF8(results[0])); + EXPECT_EQ(data[i].w1, base::UTF16ToUTF8(results[0])); if (results.size() == 2) - EXPECT_EQ(data[i].w2, UTF16ToUTF8(results[1])); + EXPECT_EQ(data[i].w2, base::UTF16ToUTF8(results[1])); if (results.size() == 3) - EXPECT_EQ(data[i].w3, UTF16ToUTF8(results[2])); + EXPECT_EQ(data[i].w3, base::UTF16ToUTF8(results[2])); } } |