Cleanup AdjustStringForLocaleDirection()

chrome/browser/search_engines/template_url.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/search_engines/template_url.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 560 matching lines @@
       usage_count_(0),
       search_engine_type_(SEARCH_ENGINE_OTHER),
       logo_id_(kNoSearchEngineLogo),
       prepopulate_id_(0) {
 }
 
 TemplateURL::~TemplateURL() {
 }
 
 std::wstring TemplateURL::AdjustedShortNameForLocaleDirection() const {
-  std::wstring bidi_safe_short_name;
-  if (base::i18n::AdjustStringForLocaleDirection(short_name_,
-                                                 &bidi_safe_short_name))
-    return bidi_safe_short_name;
-  return short_name_;
+  std::wstring bidi_safe_short_name = short_name_;
+  base::i18n::AdjustStringForLocaleDirection(&bidi_safe_short_name);
+  return bidi_safe_short_name;
 }
 
 void TemplateURL::SetSuggestionsURL(const std::string& suggestions_url,
                                     int index_offset,
                                     int page_offset) {
   suggestions_url_.Set(suggestions_url, index_offset, page_offset);
 }
 
 void TemplateURL::SetURL(const std::string& url,
                          int index_offset,
@@ skipping 73 matching lines @@
 }
 
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(url_.url()).host();
 }
 
 bool TemplateURL::IsExtensionKeyword() const {
   return GURL(url_.url()).SchemeIs(chrome::kExtensionScheme);
 }