Deprecate file_util::AppendToPath() on non-Windows.

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 203 matching lines @@
   if (profile_name != chrome::kNotSignedInProfile) {
     folder_name += kProfileFolderSeparator;
     folder_name += profile_name;
   }
   return folder_name;
 }
 
 std::wstring UserDataManager::GetUserDataFolderForProfile(
     const std::wstring& profile_name) const {
   std::wstring folder_name = GetFolderNameFromProfileName(profile_name);
-  std::wstring folder_path(user_data_root_);
-  file_util::AppendToPath(&folder_path, folder_name);
-  return folder_path;
+  FilePath folder_path =
+    FilePath::FromWStringHack(user_data_root_)
+        .Append(FilePath::FromWStringHack(folder_name));
+  return folder_path.ToWStringHack();
 }
 
 void UserDataManager::LaunchChromeForProfile(
     const std::wstring& profile_name) const {
   std::wstring user_data_dir = GetUserDataFolderForProfile(profile_name);
   FilePath command;
   PathService::Get(base::FILE_EXE, &command);
   CommandLine command_line(command);
   command_line.AppendSwitch(switches::kEnableUserDataDirProfiles);
   command_line.AppendSwitchWithValue(switches::kUserDataDir,
@@ skipping 45 matching lines @@
   std::wstring args = CommandLine::PrefixedSwitchStringWithValue(
       switches::kUserDataDir,
       user_data_dir);
   args = StringPrintf(L"\"%ls\"", args.c_str());
 
   // Shortcut path.
   std::wstring shortcut_name = l10n_util::GetStringF(
       IDS_START_IN_PROFILE_SHORTCUT_NAME,
       profile_name);
   shortcut_name.append(L".lnk");
-
-  std::wstring shortcut_path = folder.Append(shortcut_name).ToWStringHack();
+  FilePath shortcut_path = folder.Append(shortcut_name);
 
   // Profile path from user_data_dir.
   FilePath profile_path = FilePath(user_data_dir).Append(
       chrome::kNotSignedInProfile);
 
   return file_util::CreateShortcutLink(
       cmd.c_str(),
-      shortcut_path.c_str(),
+      shortcut_path.value().c_str(),
       exe_folder.c_str(),
       args.c_str(),
       NULL,
       exe_path.c_str(),
       0,
       ShellIntegration::GetChromiumAppId(profile_path).c_str());
 #else
+  // TODO(port): should probably use freedesktop.org standard for desktop files.
+  // See shell_integration.h for an implementation; but this code is reportedly
+  // obsolete.
   NOTIMPLEMENTED();
   return false;
 #endif
 }
 
 bool UserDataManager::CreateDesktopShortcutForProfile(
     const std::wstring& profile_name) const {
 #if defined(OS_WIN)
   std::wstring desktop_path;
   if (!ShellUtil::GetDesktopPath(false, &desktop_path))
     return false;
 
   return CreateShortcutForProfileInFolder(FilePath(desktop_path), profile_name);
 #else
   // TODO(port): should probably use freedesktop.org standard for desktop files.
+  // See shell_integration.h for an implementation; but this code is reportedly
+  // obsolete.
   NOTIMPLEMENTED();
   return false;
 #endif
 }
 
 void UserDataManager::RefreshUserDataDirProfiles() const {
   // UserDataDirProfilesUpdater will delete itself when done.
   UserDataDirProfilesUpdater* updater = new UserDataDirProfilesUpdater();
   updater->Run();
 }
@@ skipping 42 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());
 }