Cleanup AdjustStringForLocaleDirection()

chrome/browser/language_combobox_model.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/language_combobox_model.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
@@ skipping 72 matching lines @@
   DCHECK(it != native_names_.end());
 
   // If the name is the same in the native language and local language,
   // don't show it twice.
   if (it->second.native_name == locale_names_[index])
     return it->second.native_name;
 
   // We must add directionality formatting to both the native name and the
   // locale name in order to avoid text rendering problems such as misplaced
   // parentheses or languages appearing in the wrong order.
   std::wstring locale_name_localized;

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

This string is no longer needed. Delete.

-  std::wstring locale_name;
-  if (base::i18n::AdjustStringForLocaleDirection(locale_names_[index],
-                                                 &locale_name_localized))
-    locale_name.assign(locale_name_localized);
-  else
-    locale_name.assign(locale_names_[index]);
+  std::wstring locale_name = locale_names_[index];
+  base::i18n::AdjustStringForLocaleDirection(&locale_name);
 
-  std::wstring native_name_localized;
-  std::wstring native_name;
-  if (base::i18n::AdjustStringForLocaleDirection(it->second.native_name,
-                                                 &native_name_localized))
-    native_name.assign(native_name_localized);
-  else
-    native_name.assign(it->second.native_name);
+  std::wstring native_name = it->second.native_name;
+  base::i18n::AdjustStringForLocaleDirection(&native_name);
 
   // We used to have a localizable template here, but none of translators
   // changed the format. We also want to switch the order of locale_name
   // and native_name without going back to translators.
   std::wstring formatted_item;
   base::SStringPrintf(&formatted_item, L"%ls - %ls", locale_name.c_str(),
                       native_name.c_str());
   if (base::i18n::IsRTL())
     // Somehow combo box (even with LAYOUTRTL flag) doesn't get this
     // right so we add RTL BDO (U+202E) to set the direction
@@ skipping 59 matching lines @@
   if (!profile_)
     local_state = g_browser_process->local_state();
   else
     local_state = profile_->GetPrefs();
 
   DCHECK(local_state);
   const std::string& current_locale = local_state->GetString(prefs.c_str());
 
   return GetIndexFromLocale(current_locale);
 }