Get rid of more calls to FromWStringHack.

BUG=24672
TEST=compiles

Patch from Thiago Farina <thiago.farina@gmail.com>

Review URL: http://codereview.chromium.org/1750013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45568 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index 332866b..851ef3e 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -98,21 +98,20 @@ Profile* ProfileManager::GetDefaultProfile(const FilePath& user_data_dir) {
 #if defined(OS_CHROMEOS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (logged_in_) {
-    std::wstring profile_dir;
+    FilePath profile_dir;
     // If the user has logged in, pick up the new profile.
     // TODO(davemoore) Delete this once chromium os has started using
     // "--login-profile" instead of "--profile".
     if (command_line.HasSwitch(switches::kLoginProfile)) {
-      profile_dir = command_line.GetSwitchValue(switches::kLoginProfile);
+      profile_dir = command_line.GetSwitchValuePath(switches::kLoginProfile);
     } else if (command_line.HasSwitch(switches::kProfile)) {
-      profile_dir = command_line.GetSwitchValue(switches::kProfile);
+      profile_dir = command_line.GetSwitchValuePath(switches::kProfile);
     } else {
       // We should never be logged in with no profile dir.
       NOTREACHED();
       return NULL;
     }
-    default_profile_dir = default_profile_dir.Append(
-        FilePath::FromWStringHack(profile_dir));
+    default_profile_dir = default_profile_dir.Append(profile_dir);
     return GetProfile(default_profile_dir);
   } else {
     // If not logged in on cros, always return the incognito profile