Remove GetSwitchValue() from chrome/* where easy.

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

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

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index 3f11eb5..9dfda73 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -29,7 +29,7 @@ void InitInstallerLogging(const CommandLine& command_line) {
     return;
   }
 
-  logging::InitLogging(GetLogFilePath(command_line).c_str(),
+  logging::InitLogging(GetLogFilePath(command_line).value().c_str(),
                        logging::LOG_ONLY_TO_FILE,
                        logging::LOCK_LOG_FILE,
                        logging::DELETE_OLD_LOG_FILE);
@@ -50,10 +50,10 @@ void EndInstallerLogging() {
   installer_logging_ = false;
 }
 
-std::wstring GetLogFilePath(const CommandLine& command_line) {
+FilePath GetLogFilePath(const CommandLine& command_line) {
   if (command_line.HasSwitch(
           WideToASCII(installer_util::switches::kLogFile))) {
-    return command_line.GetSwitchValue(
+    return command_line.GetSwitchValuePath(
         WideToASCII(installer_util::switches::kLogFile));
   }
 
@@ -65,12 +65,11 @@ std::wstring GetLogFilePath(const CommandLine& command_line) {
   }
 
   FilePath log_path;
-
   if (PathService::Get(base::DIR_TEMP, &log_path)) {
     log_path = log_path.Append(log_filename);
-    return log_path.ToWStringHack();
+    return log_path;
   } else {
-    return log_filename;
+    return FilePath(log_filename);
   }
 }