Cleanup AdjustStringForLocaleDirection()

chrome/browser/encoding_menu_controller.cc

 // Copyright (c) 2009 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/encoding_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 113 matching lines @@
       profile->GetPrefs()->GetString(prefs::kStaticEncodings),
       profile->GetPrefs()->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
   // Build up output list for menu.
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     if (it->encoding_id) {
       std::wstring encoding = it->encoding_display_name;
-      std::wstring bidi_safe_encoding;
-      if (base::i18n::AdjustStringForLocaleDirection(encoding,
-                                                     &bidi_safe_encoding))
-        encoding.swap(bidi_safe_encoding);
+      base::i18n::AdjustStringForLocaleDirection(&encoding);
       menuItems->push_back(EncodingMenuItem(it->encoding_id,
                                             WideToUTF16(encoding)));
     } else {
       menuItems->push_back(separator);
     }
   }
 }