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

chrome/browser/ui/browser_init.cc

Index: chrome/browser/ui/browser_init.cc
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index a2fefdfa7f32087314ec996dc157702d41b4f581..936323d72367ae6813534d1b3650c9cb89d0f305 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -977,9 +977,9 @@ std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
       }
       const TemplateURLRef* search_url = default_provider->url();
       DCHECK(search_url->SupportsReplacement());
-      std::wstring search_term = param.ToWStringHack().substr(2);
+      string16 search_term = param.LossyDisplayName().substr(2);
       urls.push_back(GURL(search_url->ReplaceSearchTerms(
-          *default_provider, WideToUTF16Hack(search_term),
+          *default_provider, search_term,
           TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())));
     } else {
       // This will create a file URL or a regular URL.