| Index: chrome/browser/process_singleton_linux.cc
|
| diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
|
| index 0ff9a57dcbf32d8249166760c2af7cf2a068b1c0..10d632188df167663127eca8ea84faa586c19a1e 100644
|
| --- a/chrome/browser/process_singleton_linux.cc
|
| +++ b/chrome/browser/process_singleton_linux.cc
|
| @@ -505,23 +505,7 @@ void ProcessSingleton::LinuxWatcher::HandleMessage(
|
| PrefService* prefs = g_browser_process->local_state();
|
| DCHECK(prefs);
|
|
|
| - FilePath user_data_dir;
|
| - PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
|
| - ProfileManager* profile_manager = g_browser_process->profile_manager();
|
| -
|
| -#if defined(OS_CHROMEOS)
|
| - Profile* profile;
|
| - if (parsed_command_line.HasSwitch(switches::kProfile)) {
|
| - std::wstring profile_dir =
|
| - parsed_command_line.GetSwitchValue(switches::kProfile);
|
| - profile = profile_manager->GetProfile(
|
| - user_data_dir.Append(FilePath::FromWStringHack(profile_dir)));
|
| - } else {
|
| - profile = profile_manager->GetDefaultProfile(user_data_dir);
|
| - }
|
| -#else
|
| - Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
|
| -#endif
|
| + Profile* profile = ProfileManager::GetDefaultProfile();
|
|
|
| if (!profile) {
|
| // We should only be able to get here if the profile already exists and
|
|
|