FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

chrome/browser/download/download_item.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/download/download_item.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 468 matching lines @@
   // A good test case would be:
   //   "/\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd",
   //   L"/\x4f60\x597d\x4f60\x597d",
   //   "/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD"
   PrefService* prefs = download_manager_->profile()->GetPrefs();
   std::string languages(prefs->GetString(prefs::kAcceptLanguages));
   string16 url_formatted(l10n_util::ToLower(net::FormatUrl(url_, languages)));
   if (url_formatted.find(query) != string16::npos)
     return true;
 
-  string16 path(l10n_util::ToLower(WideToUTF16(full_path().ToWStringHack())));
-  if (path.find(query) != std::wstring::npos)
+  string16 path(l10n_util::ToLower(full_path().LossyDisplayName()));
+  // This shouldn't just do a substring match; it is wrong for Unicode
+  // due to normalization and we have a fancier search-query system
+  // used elsewhere.
+  // http://code.google.com/p/chromium/issues/detail?id=71982
+  if (path.find(query) != string16::npos)
     return true;
 
   return false;
 }
 
 void DownloadItem::SetFileCheckResults(const FilePath& path,
                                        bool is_dangerous,
                                        int path_uniquifier,
                                        bool prompt,
                                        bool is_extension_install,
@@ skipping 77 matching lines @@
         target_name_.value().c_str(),
         full_path().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url().spec().c_str());
   }
 
   description += " }";
 
   return description;
 }