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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/user_controller_unittest.cc

Issue 6156001: Remove wstring from l10n_util. Part 8, the last part.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/chromeos/login/user_controller.cc ('k') | chrome/browser/chromeos/login/user_image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_controller_unittest.cc
===================================================================
--- chrome/browser/chromeos/login/user_controller_unittest.cc (revision 70736)
+++ chrome/browser/chromeos/login/user_controller_unittest.cc (working copy)
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/login/user_controller.h"
#include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -13,11 +14,11 @@
TEST(UserControllerTest, GetNameTooltip) {
UserController guest_user_controller(NULL, false);
- EXPECT_EQ(l10n_util::GetString(IDS_ADD_USER),
+ EXPECT_EQ(UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER)),
guest_user_controller.GetNameTooltip());
UserController new_user_controller(NULL, true);
- EXPECT_EQ(l10n_util::GetString(IDS_GO_INCOGNITO_BUTTON),
+ EXPECT_EQ(UTF16ToWide(l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON)),
new_user_controller.GetNameTooltip());
UserManager::User existing_user;
Property changes on: chrome/browser/chromeos/login/user_controller_unittest.cc
___________________________________________________________________
Added: svn:eol-style
+ LF
« no previous file with comments | « chrome/browser/chromeos/login/user_controller.cc ('k') | chrome/browser/chromeos/login/user_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698