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

Unified Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 5989012: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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
Index: chrome/browser/task_manager/task_manager_browsertest.cc
===================================================================
--- chrome/browser/task_manager/task_manager_browsertest.cc (revision 70282)
+++ chrome/browser/task_manager/task_manager_browsertest.cc (working copy)
@@ -110,8 +110,8 @@
// Check that the third entry is a tab contents resource whose title starts
// starts with "Tab:".
ASSERT_TRUE(model()->GetResourceTabContents(2) != NULL);
- string16 prefix = WideToUTF16Hack(l10n_util::GetStringF(
- IDS_TASK_MANAGER_TAB_PREFIX, L""));
+ string16 prefix = l10n_util::GetStringFUTF16(
+ IDS_TASK_MANAGER_TAB_PREFIX, string16());
ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
// Close the tab and verify that we notice.
@@ -193,8 +193,8 @@
ASSERT_EQ(TaskManager::Resource::EXTENSION, model()->GetResourceType(2));
ASSERT_TRUE(model()->GetResourceTabContents(2) == NULL);
ASSERT_TRUE(model()->GetResourceExtension(2) != NULL);
- string16 prefix = WideToUTF16Hack(l10n_util::GetStringF(
- IDS_TASK_MANAGER_EXTENSION_PREFIX, L""));
+ string16 prefix = l10n_util::GetStringFUTF16(
+ IDS_TASK_MANAGER_EXTENSION_PREFIX, string16());
ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
// Check that the fourth entry (page.html) is of type extension and has both
@@ -233,8 +233,8 @@
ASSERT_EQ(TaskManager::Resource::EXTENSION, model()->GetResourceType(2));
ASSERT_TRUE(model()->GetResourceTabContents(2) != NULL);
ASSERT_TRUE(model()->GetResourceExtension(2) != NULL);
- string16 prefix = WideToUTF16Hack(l10n_util::GetStringF(
- IDS_TASK_MANAGER_APP_PREFIX, L""));
+ string16 prefix = l10n_util::GetStringFUTF16(
+ IDS_TASK_MANAGER_APP_PREFIX, string16());
ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
// Unload extension to avoid crash on Windows.
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698