chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc - Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc ('k') | chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc

diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc

index a6a370e83054eba7553e3426986e1eb2b24bbb95..3ffef9b233e9b7beaf02d1cd9dc6de35175c6493 100644

--- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc

+++ b/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc

@@ -23,7 +23,8 @@ namespace {

// last one is optional and only shows up when IsFirstCharOfToken returns true.

std::string GetIterateState(const TokenizedStringCharIterator& iter) {

return base::StringPrintf("%s%d%s",

- UTF16ToUTF8(base::string16(1, iter.Get())).c_str(),

+ base::UTF16ToUTF8(

+ base::string16(1, iter.Get())).c_str(),

iter.GetArrayPos(),

iter.IsFirstCharOfToken() ? "!" : "");

}

@@ -38,7 +39,7 @@ void TestBeyondTheEnd(TokenizedStringCharIterator* iter) {

}

void TestEveryChar(const std::string& text, const std::string& expects) {

- TokenizedString tokens(UTF8ToUTF16(text));

+ TokenizedString tokens(base::UTF8ToUTF16(text));

TokenizedStringCharIterator iter(tokens);

std::vector<std::string> results;

@@ -52,7 +53,7 @@ void TestEveryChar(const std::string& text, const std::string& expects) {

}

void TestNextToken(const std::string& text, const std::string& expects) {

- TokenizedString tokens(UTF8ToUTF16(text));

+ TokenizedString tokens(base::UTF8ToUTF16(text));

TokenizedStringCharIterator iter(tokens);

std::vector<std::string> results;

@@ -67,7 +68,7 @@ void TestNextToken(const std::string& text, const std::string& expects) {

void TestFirstTwoCharInEveryToken(const std::string& text,

const std::string& expects) {

- TokenizedString tokens(UTF8ToUTF16(text));

+ TokenizedString tokens(base::UTF8ToUTF16(text));

TokenizedStringCharIterator iter(tokens);

std::vector<std::string> results;