Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/options/system_page_view.cc

Index: chrome/browser/chromeos/options/system_page_view.cc
diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc
index c6fb721fd092e7ede1b9a1a8f88749d793f3ac65..ef7be1c5eee0278bed0209b10129b8ee0f73fa07 100644
--- a/chrome/browser/chromeos/options/system_page_view.cc
+++ b/chrome/browser/chromeos/options/system_page_view.cc
@@ -10,6 +10,7 @@
 #include "app/l10n_util.h"
 #include "app/combobox_model.h"
 #include "base/stl_util-inl.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -126,14 +127,15 @@ class DateTimeSection : public SettingsPageSection,
       return static_cast<int>(timezones_.size());
     }
 
-    virtual std::wstring GetItemAt(int index) {
+    virtual string16 GetItemAt(int index) {
       icu::UnicodeString name;
       timezones_[index]->getDisplayName(name);
       std::wstring output;
       UTF16ToWide(name.getBuffer(), name.length(), &output);
       int hour_offset = timezones_[index]->getRawOffset() / 3600000;
-      return StringPrintf(hour_offset == 0 ? L"(GMT) " : (hour_offset > 0 ?
-          L"(GMT+%d) " : L"(GMT%d) "), hour_offset) + output;
+      return WideToUTF16Hack(
+          StringPrintf(hour_offset == 0 ? L"(GMT) " : (hour_offset > 0 ?
+          L"(GMT+%d) " : L"(GMT%d) "), hour_offset) + output);
     }
 
     virtual icu::TimeZone* GetTimeZoneAt(int index) {