Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1890)

Unified Diff: chrome/browser/enumerate_modules_model_unittest_win.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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/download/download_extensions.cc ('k') | chrome/browser/enumerate_modules_model_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/enumerate_modules_model_unittest_win.cc
diff --git a/chrome/browser/enumerate_modules_model_unittest_win.cc b/chrome/browser/enumerate_modules_model_unittest_win.cc
index 4c15a0acde291f4ae4ff972142baddb8422f1469..68ec1545069551bd13b319b9e290b0514fa8d03b 100644
--- a/chrome/browser/enumerate_modules_model_unittest_win.cc
+++ b/chrome/browser/enumerate_modules_model_unittest_win.cc
@@ -204,7 +204,7 @@ TEST_F(EnumerateModulesTest, MatchFunction) {
kMatchineEntryList[i].blacklist;
SCOPED_TRACE("Test case no " + base::IntToString(i) +
- ": '" + UTF16ToASCII(test.name) + "'");
+ ": '" + base::UTF16ToASCII(test.name) + "'");
EXPECT_EQ(kMatchineEntryList[i].expected_result,
ModuleEnumerator::Match(test, blacklist));
}
@@ -235,8 +235,8 @@ TEST_F(EnumerateModulesTest, CollapsePath) {
module.location = kCollapsePathList[i].test_case;
module_enumerator->CollapsePath(&module);
- SCOPED_TRACE("Test case no " + base::IntToString(i) +
- ": '" + UTF16ToASCII(kCollapsePathList[i].expected_result) +
+ SCOPED_TRACE("Test case no " + base::IntToString(i) + ": '" +
+ base::UTF16ToASCII(kCollapsePathList[i].expected_result) +
"'");
EXPECT_EQ(kCollapsePathList[i].expected_result, module.location);
}
« no previous file with comments | « chrome/browser/download/download_extensions.cc ('k') | chrome/browser/enumerate_modules_model_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698