Index: chrome/browser/chromeos/system/timezone_util.cc |
diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc |
index edd2e994e3844798ab5fe2e1201f9750d6b2f54e..0200c4a06262a69ddb5ba26d40de9d55de07bc58 100644 |
--- a/chrome/browser/chromeos/system/timezone_util.cc |
+++ b/chrome/browser/chromeos/system/timezone_util.cc |
@@ -64,7 +64,7 @@ string16 GetExemplarCity(const icu::TimeZone& zone) { |
if (!U_FAILURE(status)) { |
city = icu::ures_getUnicodeStringByKey(zone_item.get(), "ec", &status); |
if (U_SUCCESS(status)) |
- return string16(city.getBuffer(), city.length()); |
+ return base::string16(city.getBuffer(), city.length()); |
} |
// Fallback case in case of failure. |
@@ -112,9 +112,9 @@ string16 GetTimezoneName(const icu::TimeZone& timezone) { |
// rules (e.g. US Mountain Time in Denver vs Phoenix). |
icu::UnicodeString name; |
timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name); |
- string16 result(l10n_util::GetStringFUTF16( |
+ base::string16 result(l10n_util::GetStringFUTF16( |
IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str), |
- string16(name.getBuffer(), name.length()), GetExemplarCity(timezone))); |
+ base::string16(name.getBuffer(), name.length()), GetExemplarCity(timezone))); |
base::i18n::AdjustStringForLocaleDirection(&result); |
return result; |
} |