Index: chromeos/settings/timezone_settings.cc |
diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc |
index 496e8879f4de02fd5bb41d499bb441398c1a4252..9c3a371747f1cd33fd6c2d18bc673047e62be959 100644 |
--- a/chromeos/settings/timezone_settings.cc |
+++ b/chromeos/settings/timezone_settings.cc |
@@ -12,6 +12,7 @@ |
#include "base/bind.h" |
#include "base/files/file_path.h" |
#include "base/files/file_util.h" |
+#include "base/i18n/unicodestring.h" |
#include "base/location.h" |
#include "base/logging.h" |
#include "base/macros.h" |
@@ -483,8 +484,7 @@ TimezoneSettings* TimezoneSettings::GetInstance() { |
// static |
base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) { |
icu::UnicodeString id; |
- timezone.getID(id); |
- return base::string16(id.getBuffer(), id.length()); |
+ return base::i18n::UnicodeStringToString16(timezone.getID(id)); |
} |
} // namespace system |