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

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2011 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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/environment.h"
 #include "base/event_recorder.h"
@@ skipping 947 matching lines @@
         false));
   }
 }
 
 std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
     Profile* profile) {
   std::vector<GURL> urls;
   const std::vector<CommandLine::StringType>& params = command_line_.args();
 
   for (size_t i = 0; i < params.size(); ++i) {
     FilePath param = FilePath(params[i]);

[Mark Mentovai, 2011/02/01 22:54:55]

Is this an abuse of FilePath?

     // Handle Vista way of searching - "? <search-term>"
     if (param.value().find(FILE_PATH_LITERAL("? ")) == 0) {
       const TemplateURL* default_provider =
           profile->GetTemplateURLModel()->GetDefaultSearchProvider();
       if (!default_provider || !default_provider->url()) {
         // No search provider available. Just treat this as regular URL.
         urls.push_back(URLFixerUpper::FixupRelativeFile(cur_dir_, param));
         continue;
       }
       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.
       // This call can (in rare circumstances) block the UI thread.
       // Allow it until this bug is fixed.
       //  http://code.google.com/p/chromium/issues/detail?id=60641
       GURL url;
       {
         base::ThreadRestrictions::ScopedAllowIO allow_io;
         url = URLFixerUpper::FixupRelativeFile(cur_dir_, param);
@@ skipping 222 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }