Cleanup AdjustStringForLocaleDirection()

app/win_util.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 "app/win_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 515 matching lines @@
                const std::wstring& text,
                const std::wstring& caption,
                UINT flags) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoMessageBox))
     return IDOK;
 
   UINT actual_flags = flags;
   if (base::i18n::IsRTL())
     actual_flags |= MB_RIGHT | MB_RTLREADING;
 
-  std::wstring localized_text;
-  const wchar_t* text_ptr = text.c_str();
-  if (base::i18n::AdjustStringForLocaleDirection(text, &localized_text))
-    text_ptr = localized_text.c_str();
+  std::wstring localized_text = text;
+  base::i18n::AdjustStringForLocaleDirection(&localized_text);
+  const wchar_t* text_ptr = localized_text.c_str();
 
-  std::wstring localized_caption;
-  const wchar_t* caption_ptr = caption.c_str();
-  if (base::i18n::AdjustStringForLocaleDirection(caption, &localized_caption))
-    caption_ptr = localized_caption.c_str();
+  std::wstring localized_caption = caption;
+  base::i18n::AdjustStringForLocaleDirection(&localized_caption);
+  const wchar_t* caption_ptr = localized_caption.c_str();
 
   return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags);
 }
 
 gfx::Font GetWindowTitleFont() {
   NONCLIENTMETRICS ncm;
   win_util::GetNonClientMetrics(&ncm);
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::Font(caption_font);
@@ skipping 31 matching lines @@
       hwnd, __uuidof(*pps), reinterpret_cast<void**>(pps.Receive()));
   if (S_OK == result) {
     SetAppIdForPropertyStore(pps, app_id.c_str());
   }
 
   // Cleanup.
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace win_util