Convert GetDisplayStringInLTRDirectionality from wstring to string16.

chrome/browser/possible_url_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/possible_url_model.h"
 
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
@@ skipping 102 matching lines @@
     // since those should always have LTR directionality. Please refer to
     // http://crbug.com/6726 for more information.
     std::wstring localized_title;
     if (base::i18n::AdjustStringForLocaleDirection(title, &localized_title))
       return localized_title;
     return title;
   }
 
   // TODO(brettw): this should probably pass the GURL up so the URL elider
   // can be used at a higher level when we know the width.
-  // Force URL to be LTR.
-  std::wstring url(UTF16ToWideHack(results_[row].display_url.display_url()));
-  base::i18n::GetDisplayStringInLTRDirectionality(&url);
-  return url;
+  string16 url = results_[row].display_url.display_url();
+  return UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(url));
 }
 
 SkBitmap PossibleURLModel::GetIcon(int row) {
   if (row < 0 || row >= RowCount()) {
     NOTREACHED();
     return *default_fav_icon;
   }
 
   Result& result = results_[row];
   FavIconMap::iterator i = fav_icon_map_.find(result.index);
@@ skipping 40 matching lines @@
       // The decoder will leave our bitmap empty on error.
       gfx::PNGCodec::Decode(data->front(), data->size(),
                             &(fav_icon_map_[index]));
 
       // Notify the observer.
       if (!fav_icon_map_[index].isNull() && observer_)
         observer_->OnItemsChanged(static_cast<int>(index), 1);
     }
   }
 }