Use FilePath in UserDataDirDialog to remove the use of FilePath::FromWString...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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/browser_main.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 531 matching lines @@
 
   // Try to create/load the profile.
   ProfileManager* profile_manager = browser_process->profile_manager();
   Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
 #if defined(OS_WIN)
   if (!profile) {
     // Ideally, we should be able to run w/o access to disk.  For now, we
     // prompt the user to pick a different user-data-dir and restart chrome
     // with the new dir.
     // http://code.google.com/p/chromium/issues/detail?id=11510
-    user_data_dir = FilePath::FromWStringHack(
-        UserDataDirDialog::RunUserDataDirDialog(user_data_dir.ToWStringHack()));
+    user_data_dir = UserDataDirDialog::RunUserDataDirDialog(user_data_dir);
     if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) {
       // Only delete the resources if we're not running tests. If we're running
       // tests the resources need to be reused as many places in the UI cache
       // SkBitmaps from the ResourceBundle.
       ResourceBundle::CleanupSharedInstance();
     }
 
     if (!user_data_dir.empty()) {
       // Because of the way CommandLine parses, it's sufficient to append a new
       // --user-data-dir switch.  The last flag of the same name wins.
@@ skipping 325 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }