Deprecate wstring version of PathService::Get() in webkit.

chrome/browser/browser_init.cc

 // Copyright (c) 2006-2008 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_init.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
+#include "base/file_path.h"
 #include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 70 matching lines @@
   // The Profile that we restore sessions from.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate);
 };
 
 void SetOverrideHomePage(const CommandLine& command_line,
                          PrefService* prefs) {
   // If homepage is specified on the command line, canonify & store it.
   if (command_line.HasSwitch(switches::kHomePage)) {
-    std::wstring browser_directory;
+    FilePath browser_directory;
     PathService::Get(base::DIR_CURRENT, &browser_directory);
     std::wstring new_homepage = URLFixerUpper::FixupRelativeFile(
-        browser_directory,
+        browser_directory.ToWStringHack(),
         command_line.GetSwitchValue(switches::kHomePage));
     prefs->transient()->SetString(prefs::kHomePage, new_homepage);
     prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false);
   }
 }
 
 SessionStartupPref GetSessionStartupPref(const CommandLine& command_line,
                                          Profile* profile) {
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);
   if (command_line.HasSwitch(switches::kRestoreLastSession))
@@ skipping 129 matching lines @@
         browser = BrowserList::GetLastActive();
       OpenURLsInBrowser(browser, process_startup, urls_to_open);
     }
   } else {
     RecordLaunchModeHistogram(LM_AS_WEBAPP);
   }
 
   // If we're recording or playing back, startup the EventRecorder now
   // unless otherwise specified.
   if (!command_line_.HasSwitch(switches::kNoEvents)) {
-    std::wstring script_path;
+    FilePath script_path;
     PathService::Get(chrome::FILE_RECORDED_SCRIPT, &script_path);
 
     bool record_mode = command_line_.HasSwitch(switches::kRecordMode);
     bool playback_mode = command_line_.HasSwitch(switches::kPlaybackMode);
 
     if (record_mode && chrome::kRecordModeEnabled)
       base::EventRecorder::current()->StartRecording(script_path);
     if (playback_mode)
       base::EventRecorder::current()->StartPlayback(script_path);
   }
@@ skipping 288 matching lines @@
   bool launched = lwp.Launch(profile, process_startup);
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL)
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     return false;
   }
 
   return true;
 }