diff options
Diffstat (limited to 'cloud_print/service/win')
| -rw-r--r-- | cloud_print/service/win/chrome_launcher.cc | 8 | ||||
| -rw-r--r-- | cloud_print/service/win/cloud_print_service.cc | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index 1d5395a..831af6f 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -121,8 +121,7 @@ void DeleteAutorunKeys(const base::FilePath& user_data_dir) { return; std::vector<string16> to_delete; - base::FilePath abs_user_data_dir = user_data_dir; - file_util::AbsolutePath(&abs_user_data_dir); + base::FilePath abs_user_data_dir = base::MakeAbsoluteFilePath(user_data_dir); { base::win::RegistryValueIterator value(HKEY_CURRENT_USER, kAutoRunKeyPath); @@ -132,9 +131,8 @@ void DeleteAutorunKeys(const base::FilePath& user_data_dir) { if (cmd.GetSwitchValueASCII(switches::kProcessType) == switches::kServiceProcess && cmd.HasSwitch(switches::kUserDataDir)) { - base::FilePath path_from_reg = - cmd.GetSwitchValuePath(switches::kUserDataDir); - file_util::AbsolutePath(&path_from_reg); + base::FilePath path_from_reg = base::MakeAbsoluteFilePath( + cmd.GetSwitchValuePath(switches::kUserDataDir)); if (path_from_reg == abs_user_data_dir) { to_delete.push_back(value.Name()); } diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc index 3327d60..dd20668 100644 --- a/cloud_print/service/win/cloud_print_service.cc +++ b/cloud_print/service/win/cloud_print_service.cc @@ -184,7 +184,7 @@ class CloudPrintServiceModule user_data_dir_switch_ = command_line.GetSwitchValuePath(switches::kUserDataDir); if (!user_data_dir_switch_.empty()) - file_util::AbsolutePath(&user_data_dir_switch_); + user_data_dir_switch_ = base::MakeAbsoluteFilePath(user_data_dir_switch_); if (command_line.HasSwitch(kStopSwitch)) return controller_->StopService(); |