Cleanup AdjustStringForLocaleDirection()

chrome/browser/chromeos/dom_ui/system_settings_provider.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/dom_ui/system_settings_provider.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
@@ skipping 255 matching lines @@
   // to ICU 4.6.
   // In the meantime, we use "LONG" name with "Exemplar City" to distinguish
   // multiple timezones with the same "LONG" name but with different
   // rules (e.g. US Mountain Time in Dever vs Phoneix).
   icu::UnicodeString name;
   timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name);
   string16 result(l10n_util::GetStringFUTF16(
       IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str),
       string16(name.getBuffer(), name.length()), GetExemplarCity(timezone)));
   string16 rtl_safe_result = result;
-  base::i18n::AdjustStringForLocaleDirection(result, &rtl_safe_result);
+  base::i18n::AdjustStringForLocaleDirection(&rtl_safe_result);
   return rtl_safe_result;

[Avi (use Gerrit), 2010/11/23 16:07:08]

So the original code was wrong :). Drop the use of rtl_safe_result, and just run
result through Adjust. Avoid a copy.

 }
 
 string16 SystemSettingsProvider::GetTimezoneID(
     const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
   return string16(id.getBuffer(), id.length());
 }
 
 const icu::TimeZone* SystemSettingsProvider::GetTimezone(
     const string16& timezone_id) {
   for (std::vector<icu::TimeZone*>::iterator iter = timezones_.begin();
        iter != timezones_.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
     if (GetTimezoneID(*timezone) == timezone_id) {
       return timezone;
     }
   }
   return NULL;
 }
 
 }  // namespace chromeos