Deprecate PathService::Get(..., wstring*) and use FilePath instead.

chrome/browser/user_data_manager.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 "build/build_config.h"
 
 #include "chrome/browser/user_data_manager.h"
 
 #include <string>
 
@@ skipping 11 matching lines @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include "chrome/installer/util/shell_util.h"
 #endif
 
 namespace {
 
+// TODO: don't use wstrings in all this code.  :(

[Evan Stade, 2009/10/19 22:54:31]

TODO(evan)

+// But I'm not fixing it right now since this code is reported to be going
+// away.
+void DeprecatedPathServiceGet(int key, std::wstring* str) {
+  FilePath path;
+  PathService::Get(key, &path);
+  *str = path.ToWStringHack();
+}
+
 // Helper to start chrome for a given profile index. The helper takes care of
 // enumerating profiles on the file thread and then it launches Chrome for the
 // appropriate profile on the original thread.
 // An instance of this class should always be created on the heap, and it will
 // delete itself when the launch is done.
 class LaunchChromeForProfileIndexHelper : GetProfilesHelper::Delegate {
  public:
   // Creates an instance with the given data manager and to launch chrome for
   // the profile with the given index.
   LaunchChromeForProfileIndexHelper(const UserDataManager* manager, int index);
@@ skipping 46 matching lines @@
 // For e.g. a folder for the profile "Joe" would be named "User Data-Joe".
 static const wchar_t kProfileFolderSeparator[] = L"-";
 
 // static
 UserDataManager* UserDataManager::instance_ = NULL;
 
 // static
 UserDataManager* UserDataManager::Create() {
   DCHECK(!instance_);
   std::wstring user_data;
-  PathService::Get(chrome::DIR_USER_DATA, &user_data);
+  DeprecatedPathServiceGet(chrome::DIR_USER_DATA, &user_data);
   instance_ = new UserDataManager(user_data);
   return instance_;
 }
 
 // static
 UserDataManager* UserDataManager::Get() {
   DCHECK(instance_);
   return instance_;
 }
 
@@ skipping 64 matching lines @@
   std::wstring folder_name = GetFolderNameFromProfileName(profile_name);
   std::wstring folder_path(user_data_root_);
   file_util::AppendToPath(&folder_path, folder_name);
   return folder_path;
 }
 
 void UserDataManager::LaunchChromeForProfile(
     const std::wstring& profile_name) const {
   std::wstring user_data_dir = GetUserDataFolderForProfile(profile_name);
   std::wstring command;
-  PathService::Get(base::FILE_EXE, &command);
+  DeprecatedPathServiceGet(base::FILE_EXE, &command);
   CommandLine command_line(command);
   command_line.AppendSwitch(switches::kEnableUserDataDirProfiles);
   command_line.AppendSwitchWithValue(switches::kUserDataDir,
                                      user_data_dir);
   std::wstring local_state_path;
-  PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
+  DeprecatedPathServiceGet(chrome::FILE_LOCAL_STATE, &local_state_path);
   command_line.AppendSwitchWithValue(switches::kParentProfile,
                                      local_state_path);
   base::LaunchApp(command_line, false, false, NULL);
 }
 
 void UserDataManager::LaunchChromeForProfile(int index) const {
   // Helper deletes itself when done.
   LaunchChromeForProfileIndexHelper* helper =
       new LaunchChromeForProfileIndexHelper(this, index);
   helper->StartLaunch();
@@ skipping 103 matching lines @@
                         &GetProfilesHelper::InvokeDelegate,
                         profiles.release()));
 }
 
 void GetProfilesHelper::InvokeDelegate(std::vector<std::wstring>* profiles) {
   scoped_ptr< std::vector<std::wstring> > udd_profiles(profiles);
   // If the delegate is gone by now, no need to do any work.
   if (delegate_)
     delegate_->OnGetProfilesDone(*udd_profiles.get());
 }